specify alpine version instead of edge

ziglang · Mar 26, 2020 · 2675497 · 2675497
1 parent 698322b
commit 2675497
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge as builder
+FROM alpine:3.11 as builder
 
 RUN apk update && \
     apk add \
@@ -45,7 +45,7 @@ WORKDIR /deps/clang-10.0.0.src/build
 RUN cmake .. -DCMAKE_INSTALL_PREFIX=/deps/local -DCMAKE_PREFIX_PATH=/deps/local -DCMAKE_BUILD_TYPE=Release
 RUN make $MAKE_JOBS install
 
-FROM alpine:edge
+FROM alpine:3.11
 RUN apk update && \
     apk add \
         gcc \

diff --git a/README.md b/README.md
@@ -31,6 +31,8 @@ docker run --rm -it --mount type=bind,source="$(pwd)",target=/z ziglang/static-b
 This only needs to be done if we need to tweak the build environment, or if
 we update the LLVM or Clang dependencies.
 
+Decide whether to bump the base alpine image version.
+
 ```
 docker build --build-arg MAKE_JOBS=-j$(nproc) -t ziglang/static-base:llvm10-$(uname -m)-1 .
 docker push ziglang/static-base:llvm10-$(uname -m)-1