Fixes #676: Update dockerfile; Update alpine base images; Fix multipl…

…e CVEs (#677) Co-authored-by: Bo-Yi Wu <[email protected]>
appleboy · Jun 30, 2022 · 409c0d7 · 409c0d7
1 parent cf67458
commit 409c0d7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
@@ -1,10 +1,13 @@
-FROM plugins/base:linux-amd64
+FROM alpine:3.15.4@sha256:a777c9c66ba177ccfea23f2a216ff6721e78a662cd17019488c417135299cd89
 
 LABEL maintainer="Bo-Yi Wu <[email protected]>" \
   org.label-schema.name="Gorush" \
   org.label-schema.vendor="Bo-Yi Wu" \
   org.label-schema.schema-version="1.0"
 
+RUN apk add --no-cache ca-certificates mailcap && \
+	echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 COPY release/linux/amd64/gorush /bin/
 
 EXPOSE 8088 9000

diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm
@@ -1,10 +1,13 @@
-FROM plugins/base:linux-arm
+FROM alpine:3.15.4@sha256:a777c9c66ba177ccfea23f2a216ff6721e78a662cd17019488c417135299cd89
 
 LABEL maintainer="Bo-Yi Wu <[email protected]>" \
   org.label-schema.name="Gorush" \
   org.label-schema.vendor="Bo-Yi Wu" \
   org.label-schema.schema-version="1.0"
 
+RUN apk add --no-cache ca-certificates mailcap && \
+	echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 COPY release/linux/arm/gorush /bin/
 
 EXPOSE 8088 9000

diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
@@ -1,10 +1,13 @@
-FROM plugins/base:linux-arm64
+FROM alpine:3.15.4@sha256:a777c9c66ba177ccfea23f2a216ff6721e78a662cd17019488c417135299cd89
 
 LABEL maintainer="Bo-Yi Wu <[email protected]>" \
   org.label-schema.name="Gorush" \
   org.label-schema.vendor="Bo-Yi Wu" \
   org.label-schema.schema-version="1.0"
 
+RUN apk add --no-cache ca-certificates mailcap && \
+	echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 COPY release/linux/arm64/gorush /bin/
 
 EXPOSE 8088 9000