From 2d6680986ff7948871353bcf9478a10e0655fc44 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 12 Mar 2018 16:02:24 -0700 Subject: [PATCH] Remove entrypoint from Dockerfile so build arguments properly flow into the container --- build/docker/alpine.Dockerfile | 3 +-- dockerbuild.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 07f85caee5..66a49420e8 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -21,6 +21,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Workarounds https://github.com/dotnet/cli/issues/8738 ENV DOTNET_INSTALL_SKIP_PREREQS=1 ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1 +ENV IsAlpineSupported=true COPY global.json /tmp/global.json RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \ @@ -29,5 +30,3 @@ RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \ && mkdir -p /usr/share/dotnet \ && tar xzf /tmp/dotnet.tar.gz -C /usr/share/dotnet \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -ENTRYPOINT [ './build.sh', '/p:IsAlpineSupported=true' ] diff --git a/dockerbuild.sh b/dockerbuild.sh index 758bf6b082..da7c76ea9d 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -108,4 +108,5 @@ docker run \ -v "$DIR:/code/build" \ ${docker_args[@]+"${docker_args[@]}"} \ $tagname \ + ./build.sh \ ${build_args[@]+"${build_args[@]}"}