diff options
author | Nate McMaster <natemcmaster@users.noreply.github.com> | 2018-11-02 01:02:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-02 01:02:29 +0300 |
commit | 27deb6f6f88f2cb5217ccfff7bb1d9675b394e56 (patch) | |
tree | 7e6ab2c79c3456ba7ae25284807835f479a9b9cf /dockerbuild.sh | |
parent | 7388b64ed9499b56ec18df01d45e46cee6389f42 (diff) |
Remove dependency on Docker from MSBuild targets (#3866)
Changes:
* This removes MSBuild targets which invoke `docker` commands to build
deb and rpm installers
* Remove installer targets from the KoreBuild context. Put them into
separate project files
* Simplify the targets used to build installers by reducing duplicate
variable names and deeply nested MSBuild contexts
* Remove unused dependencies from the Docker build context
Diffstat (limited to 'dockerbuild.sh')
-rwxr-xr-x | dockerbuild.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dockerbuild.sh b/dockerbuild.sh index ccc55b8852..db6dbbaa15 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -87,6 +87,12 @@ if ! __machine_has docker; then exit 1 fi +commit_hash="$(git rev-parse HEAD || true)" + +if [ ! -z "$commit_hash" ]; then + build_args[${#build_args[*]}]="-p:RepositoryCommit=$commit_hash" +fi + dockerfile="$DIR/build/docker/$image.Dockerfile" tagname="aspnetcore-build-$image" |