Skip to content

Commit

Permalink
synch the Dockerfile variants; require libatomic and ps command
Browse files Browse the repository at this point in the history
  • Loading branch information
qrkourier committed Oct 18, 2022
1 parent 0eb2a5e commit 21e40b6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ FROM debian:buster-slim
RUN mkdir -p /usr/local/bin /etc/ssl/certs
# libsystemd: install the shared object, necessary in conjunction with --volume "/var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket" to communicate with the host's dbus socket to configure systemd-resolved
# iproute2: install /sbin/ip, necessary in conjunction with --device="/dev/net/tun:/dev/net/tun" to up the tun device, assign routes, and assign source IP
RUN apt-get -q update && apt-get -q install -y --no-install-recommends iproute2 libsystemd0
RUN apt-get -q update && apt-get -q install -y --no-install-recommends iproute2 libsystemd0 procps libatomic1
# Use 32-bit arm binaries on arm64 until we have 64-bit arm builds. This also affects fetch-github-releases.sh.
RUN /bin/bash -c 'if [[ "$(uname -m)" == "aarch64" ]]; then dpkg --add-architecture armhf; apt update; apt install -y libc6:armhf; fi'
COPY --from=fetch-ziti-artifacts /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.copy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim as fetch-ziti-artifacts
FROM debian:buster-slim as fetch-ziti-artifacts

# This build stage grabs artifacts that are copied into the final image.
# It uses the same base as the final image to maximize docker cache hits.
Expand Down Expand Up @@ -26,13 +26,13 @@ COPY ${ARTIFACTS_DIR}/ziti-edge-tunnel .
#
################

FROM debian:bullseye-slim
FROM debian:buster-slim

ARG DOCKER_BUILD_DIR=./docker
ARG ZITI_TUNNELER_BIN=ziti-edge-tunnel

RUN mkdir -p /usr/local/bin /etc/ssl/certs
RUN apt-get -q update && apt-get -q install -y --no-install-recommends iproute2 libsystemd0 openssl
RUN apt-get -q update && apt-get -q install -y --no-install-recommends iproute2 libsystemd0 openssl procps libatomic1
COPY --from=fetch-ziti-artifacts /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs
COPY --from=fetch-ziti-artifacts /tmp/${ZITI_TUNNELER_BIN} /usr/local/bin
COPY ${DOCKER_BUILD_DIR}/docker-entrypoint.sh /
Expand Down

0 comments on commit 21e40b6

Please sign in to comment.