From 94c426f0f6487870fd03fb59531b47be54770a06 Mon Sep 17 00:00:00 2001 From: yankay Date: Thu, 23 Dec 2021 21:33:20 +0800 Subject: [PATCH] Fix for code style Signed-off-by: yankay --- CHANGELOG-4.0.md | 4 ++++ Dockerfile-release.amd64 | 2 +- Dockerfile-release.arm64 | 2 +- Dockerfile-release.ppc64le | 3 +-- Dockerfile-release.s390x | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md index 6b15f723719a..697d93ec045a 100644 --- a/CHANGELOG-4.0.md +++ b/CHANGELOG-4.0.md @@ -44,6 +44,10 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.5.0...v4.0.0) and - `etcd --corrupt-check-time=12h` by default, to check cluster database hashes for every 12-hour. - Enable TLS 1.13, deprecate TLS cipher suites. +### Other + +- Use Distroless as base image to make the image less vulnerable and reduce image size. + ### Go - Require [*Go 2*](https://blog.golang.org/go2draft). diff --git a/Dockerfile-release.amd64 b/Dockerfile-release.amd64 index cb93afe76e66..67400b69686e 100644 --- a/Dockerfile-release.amd64 +++ b/Dockerfile-release.amd64 @@ -1,5 +1,5 @@ FROM --platform=linux/amd64 busybox:1.34.1 as source -FROM --platform=linux/amd64 gcr.io/distroless/base-debian11 +FROM --platform=linux/amd64 gcr.io/distroless/base-debian11 COPY --from=source /bin/sh /bin/sh COPY --from=source /bin/mkdir /bin/mkdir diff --git a/Dockerfile-release.arm64 b/Dockerfile-release.arm64 index 53d3c274151c..b8ce477afd49 100644 --- a/Dockerfile-release.arm64 +++ b/Dockerfile-release.arm64 @@ -1,5 +1,5 @@ FROM --platform=linux/arm64 busybox:1.34.1 as source -FROM --platform=linux/arm64 gcr.io/distroless/base-debian11 +FROM --platform=linux/arm64 gcr.io/distroless/base-debian11 COPY --from=source /bin/sh /bin/sh COPY --from=source /bin/mkdir /bin/mkdir diff --git a/Dockerfile-release.ppc64le b/Dockerfile-release.ppc64le index 81fc64bc67d8..9cfe5d433314 100644 --- a/Dockerfile-release.ppc64le +++ b/Dockerfile-release.ppc64le @@ -1,10 +1,9 @@ FROM --platform=linux/ppc64le busybox:1.34.1 as source -FROM --platform=linux/ppc64le gcr.io/distroless/base-debian11 +FROM --platform=linux/ppc64le gcr.io/distroless/base-debian11 COPY --from=source /bin/sh /bin/sh COPY --from=source /bin/mkdir /bin/mkdir - ADD etcd /usr/local/bin/ ADD etcdctl /usr/local/bin/ ADD etcdutl /usr/local/bin/ diff --git a/Dockerfile-release.s390x b/Dockerfile-release.s390x index 42bc5d5a018f..d901b410c98e 100644 --- a/Dockerfile-release.s390x +++ b/Dockerfile-release.s390x @@ -1,5 +1,5 @@ FROM --platform=linux/s390x busybox:1.34.1 as source -FROM --platform=linux/s390x gcr.io/distroless/base-debian11 +FROM --platform=linux/s390x gcr.io/distroless/base-debian11 COPY --from=source /bin/sh /bin/sh COPY --from=source /bin/mkdir /bin/mkdir