Skip to content

Commit 5c3dc8d

Browse files
committed
Move aarch64 compatibility workaround to interactive image only
1 parent 2ebe23f commit 5c3dc8d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
4040
wget \
4141
&& rm -rf /var/lib/apt/lists/*
4242

43-
# improve compatibility with amd64 solc in non-amd64 environments (e.g. Docker Desktop on M1 Mac)
44-
ENV QEMU_LD_PREFIX=/usr/x86_64-linux-gnu
45-
RUN if [ ! "$(uname -m)" = "x86_64" ]; then \
46-
export DEBIAN_FRONTEND=noninteractive \
47-
&& apt-get update \
48-
&& apt-get install -y --no-install-recommends libc6-amd64-cross \
49-
&& rm -rf /var/lib/apt/lists/*; fi
50-
5143
# Add n (node version manager), lts node, npm, and yarn
5244
RUN curl -fsSL https://raw.githubusercontent.com/tj/n/v10.1.0/bin/n -o n && \
5345
if [ ! "a09599719bd38af5054f87b8f8d3e45150f00b7b5675323aa36b36d324d087b9 n" = "$(sha256sum n)" ]; then \
@@ -73,6 +65,14 @@ CMD ["/bin/bash"]
7365
###
7466
FROM toolbox-base AS toolbox
7567

68+
# improve compatibility with amd64 solc in non-amd64 environments (e.g. Docker Desktop on M1 Mac)
69+
ENV QEMU_LD_PREFIX=/usr/x86_64-linux-gnu
70+
RUN if [ ! "$(uname -m)" = "x86_64" ]; then \
71+
export DEBIAN_FRONTEND=noninteractive \
72+
&& apt-get update \
73+
&& apt-get install -y --no-install-recommends libc6-amd64-cross \
74+
&& rm -rf /var/lib/apt/lists/*; fi
75+
7676
# Add a user with passwordless sudo
7777
RUN useradd -m ethsec && \
7878
usermod -aG sudo ethsec && \

0 commit comments

Comments
 (0)