Fix up dockerfiles so they work for e.g. armv7 too

This commit is contained in:
Tony Garnock-Jones 2021-11-13 12:42:02 +01:00
parent c55b9cf6e5
commit 9fb8a85039
2 changed files with 3 additions and 2 deletions

View File

@ -9,8 +9,7 @@ COPY ./squid/mitm-myself.sh /root
RUN /root/mitm-myself.sh ${http_proxy_hostname}
ARG http_proxy
RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add bash sudo alpine-sdk linux-headers \
rustup openssl-dev
RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add bash sudo alpine-sdk linux-headers
ARG UID
ARG BUILD_USER

View File

@ -3,6 +3,8 @@ ARG DOCKER_ARCH
FROM --platform=linux/${DOCKER_ARCH} synit-build:${ALPINE_ARCH}
ARG http_proxy
RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add rustup openssl-dev
# Running without proxy for now, to ensure reasonable freshness and consistency:
# RUN http_proxy=${http_proxy} https_proxy=${http_proxy} rustup-init -y --default-toolchain nightly
#