Skip to content

Commit

Permalink
Merge pull request #13386 from hexfusion/cp-13376-release-3.3
Browse files Browse the repository at this point in the history
[release-3.3] Dockerfile: bump debian bullseye-20210927
  • Loading branch information
ptabor authored Oct 4, 2021
2 parents 984d71c + 24801f5 commit e82c2fd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Dockerfile-release
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM alpine:latest
# TODO: move to k8s.gcr.io/build-image/debian-base:bullseye-v1.y.z when patched
FROM debian:bullseye-20210927

ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
Expand Down
9 changes: 8 additions & 1 deletion Dockerfile-release.arm64
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
FROM aarch64/ubuntu:16.04
# TODO: move to k8s.gcr.io/build-image/debian-base-arm64:bullseye-1.y.z when patched
FROM arm64v8/debian:bullseye-20210927

ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
ADD var/etcd /var/etcd
ADD var/lib/etcd /var/lib/etcd

# Alpine Linux doesn't use pam, which means that there is no /etc/nsswitch.conf,
# but Golang relies on /etc/nsswitch.conf to check the order of DNS resolving
# (see https://github.com/golang/go/commit/9dee7771f561cf6aee081c0af6658cc81fac3918)
# To fix this we just create /etc/nsswitch.conf and add the following line:
RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf

EXPOSE 2379 2380

# Define default command.
Expand Down
9 changes: 8 additions & 1 deletion Dockerfile-release.ppc64le
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
FROM ppc64le/ubuntu:16.04
# TODO: move to k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-1.y.z when patched
FROM ppc64le/debian:bullseye-20210927

ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
ADD var/etcd /var/etcd
ADD var/lib/etcd /var/lib/etcd

# Alpine Linux doesn't use pam, which means that there is no /etc/nsswitch.conf,
# but Golang relies on /etc/nsswitch.conf to check the order of DNS resolving
# (see https://github.com/golang/go/commit/9dee7771f561cf6aee081c0af6658cc81fac3918)
# To fix this we just create /etc/nsswitch.conf and add the following line:
RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf

EXPOSE 2379 2380

# Define default command.
Expand Down

0 comments on commit e82c2fd

Please sign in to comment.