move variables to dockerrun

This commit is contained in:
Christopher Costa 2019-01-24 16:13:25 -08:00
parent 5b91dfa9fb
commit 5524bf3433
2 changed files with 11 additions and 4 deletions

View file

@ -182,7 +182,7 @@ jobs:
_DropSuffix: ''
Build_Rhel_6_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker rhel.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
_DockerParameter: '--docker rhel.6'
_LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
_BuildArchitecture: 'x64'
@ -190,14 +190,14 @@ jobs:
_AdditionalBuildParameters: '/p:DisableSourceLink=true'
Build_Linux_musl_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker alpine.3.6 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
_DockerParameter: '--docker alpine.3.6'
_LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
_BuildArchitecture: 'x64'
_DropSuffix: ''
Build_Linux_Portable_Deb_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker ubuntu.16.04 -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
_DockerParameter: '--docker ubuntu.16.04'
_LinuxPortable: '--linux-portable'
_RuntimeIdentifier: ''
_BuildArchitecture: 'x64'
@ -207,7 +207,7 @@ jobs:
_AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
Build_Linux_Portable_Rpm_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker rhel -e BUILD_REPOSITORY_URI -e BUILD_SOURCEBRANCH -e BUILD_BUILDNUMBER -e BUILD_SOURCEVERSION'
_DockerParameter: '--docker rhel'
_LinuxPortable: '--linux-portable'
_RuntimeIdentifier: ''
_BuildArchitecture: 'x64'

View file

@ -140,6 +140,13 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
-e PB_ASSETROOTURL \
-e PB_PACKAGEVERSIONPROPSURL \
-e PB_PUBLISHBLOBFEEDURL \
-e _PUBLISHBLOBFEEDURL
-e _ASSETROOTURL \
-e _PACKAGEVERSIONPROPSURL \
-e EXTERNALRESTORESOURCES \
-e BUILD_REPOSITORY_URI \
-e BUILD_SOURCEBRANCH \
-e BUILD_BUILDNUMBER \
-e BUILD_SOURCEVERSION
$DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@"