Skip to content

Commit

Permalink
Fix for code style
Browse files Browse the repository at this point in the history
Signed-off-by: yankay <kay.yan@daocloud.io>
  • Loading branch information
yankay committed Jan 18, 2022
1 parent f24e023 commit 94c426f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG-4.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-release.amd64
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-release.arm64
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-release.ppc64le
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-release.s390x
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 94c426f

Please sign in to comment.