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

Remove entrypoint from Dockerfile so build arguments properly flow into the container

This commit is contained in:
Nate McMaster 2018-03-12 16:02:24 -07:00
parent 2f13959505
commit 2d6680986f
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/docker/alpine.Dockerfile
View File

@ -21,6 +21,7 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Workarounds https://github.com/dotnet/cli/issues/8738 # Workarounds https://github.com/dotnet/cli/issues/8738
ENV DOTNET_INSTALL_SKIP_PREREQS=1 ENV DOTNET_INSTALL_SKIP_PREREQS=1
ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1 ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1
ENV IsAlpineSupported=true
COPY global.json /tmp/global.json COPY global.json /tmp/global.json
RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /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 \ && mkdir -p /usr/share/dotnet \
&& tar xzf /tmp/dotnet.tar.gz -C /usr/share/dotnet \ && tar xzf /tmp/dotnet.tar.gz -C /usr/share/dotnet \
&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
ENTRYPOINT [ './build.sh', '/p:IsAlpineSupported=true' ]

1
dockerbuild.sh
View File

@ -108,4 +108,5 @@ docker run \
-v "$DIR:/code/build" \ -v "$DIR:/code/build" \
${docker_args[@]+"${docker_args[@]}"} \ ${docker_args[@]+"${docker_args[@]}"} \
$tagname \ $tagname \
./build.sh \
${build_args[@]+"${build_args[@]}"} ${build_args[@]+"${build_args[@]}"}