Skip to content

Commit

Permalink
Remove armv7 workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
cruizba committed Feb 18, 2023
1 parent 43dd0a1 commit 0a94d47
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@ FROM ubuntu:20.04
RUN apt update \
&& apt install -y ca-certificates openssh-client \
wget curl iptables supervisor \
&& rm -rf /var/lib/apt/list/* && \
if [ $(uname -m) = "armv7" ] || [ $(uname -m) = "armv7l" ]; then \
# For some reason, certificates are incorrectly installed on armv7l
# So it is necessary to post process the certificates
# with this command to make it work
# https://stackoverflow.com/a/70771488
for i in /etc/ssl/certs/*.pem; do HASH=$(openssl x509 -hash -noout -in $i); ln -s $(basename $i) /etc/ssl/certs/$HASH.0; done; \
fi
&& rm -rf /var/lib/apt/list/*

ENV DOCKER_CHANNEL=stable \
DOCKER_VERSION=20.10.23 \
Expand All @@ -27,7 +20,7 @@ RUN set -eux; \
# arm32v6
armhf) dockerArch='armel' ;; \
# arm32v7
armv7|armv7l) dockerArch='armhf' ;; \
armv7) dockerArch='armhf' ;; \
# arm64v8
aarch64) dockerArch='aarch64' ;; \
*) echo >&2 "error: unsupported architecture ($arch)"; exit 1 ;;\
Expand Down

0 comments on commit 0a94d47

Please sign in to comment.