huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix whitespace in task parameters (#1322) 

In MSBuild 15.8, whitespace in task parameters is handled differently in a way that causes these docker commands to fail.
This commit is contained in:
Nate McMaster 2018-08-16 16:48:08 -07:00 committed by GitHub
parent 8658074df7
commit 267b149bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build/SharedFxInstaller.targets
View File

@ -111,29 +111,7 @@
<!-- Retry added due to fpm/docker race where .w/package_root directory cannot be resolved -->
<Run
FileName="docker"
Command="
run
--rm
-v $(RepositoryRoot):$(_DockerRootDir)
docker-image-$(Image)
fpm
--verbose
-s dir
-t rpm
-n $(RpmName)-$(RpmIdVersion)
-p $(_DockerRootDir)artifacts/installers/$(RpmName)-$(RpmFileVersion)-$(RpmFileSuffix)
-v $(RpmPackageVersion)
--iteration $(RpmRevision)
-a amd64
$(RpmArguments)
--rpm-changelog $(_DockerRootDir).w/templates/changelog
--rpm-summary &quot;$(RpmMSummary)&quot;
--description &quot;$(RpmDescription)&quot;
--maintainer &quot;$(RpmMaintainerName) &lt;$(RpmMaintainerEmail)&gt;&quot;
--vendor &quot;$(RpmVendor)&quot;
--license &quot;$(RpmLicense)&quot;
--url &quot;$(RpmHomepage)&quot;
$(_DockerRootDir).w/package_root/=&quot;$(RpmInstallRoot)/&quot;"
Command="run --rm -v $(RepositoryRoot):$(_DockerRootDir) docker-image-$(Image) fpm --verbose -s dir -t rpm -n $(RpmName)-$(RpmIdVersion) -p $(_DockerRootDir)artifacts/installers/$(RpmName)-$(RpmFileVersion)-$(RpmFileSuffix) -v $(RpmPackageVersion) --iteration $(RpmRevision) -a amd64 $(RpmArguments) --rpm-changelog $(_DockerRootDir).w/templates/changelog --rpm-summary &quot;$(RpmMSummary)&quot; --description &quot;$(RpmDescription)&quot; --maintainer &quot;$(RpmMaintainerName) &lt;$(RpmMaintainerEmail)&gt;&quot; --vendor &quot;$(RpmVendor)&quot; --license &quot;$(RpmLicense)&quot; --url &quot;$(RpmHomepage)&quot; $(_DockerRootDir).w/package_root/=&quot;$(RpmInstallRoot)/&quot;"
MaxRetries="5"/>
</Target>
@ -221,14 +199,7 @@
<!-- Build SharedFx Bundle Deb package -->
<Exec Command="docker run
--rm
-v $(RepositoryRoot):$(_DockerRootDir)
-e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-e INSTALLER_NAME=$(DebPrefix)-$(DebIdVersion)
-e INSTALLER_VERSION=$(DebPackageVersion)
docker-image-$(Image)
./build.sh /t:RunDebTool"
<Exec Command="docker run --rm -v $(RepositoryRoot):$(_DockerRootDir) -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -e INSTALLER_NAME=$(DebPrefix)-$(DebIdVersion) -e INSTALLER_VERSION=$(DebPackageVersion) docker-image-$(Image) ./build.sh /t:RunDebTool"
ContinueOnError="WarnAndContinue" />
<!-- Copy SharedFx packages to output -->