Skip to content

Commit 7cfa309

Browse files
committed
Remove i386 multi-arch since broken in ubuntu-jammy-20250404
1 parent 9d127b2 commit 7cfa309

File tree

2 files changed

+1
-33
lines changed

2 files changed

+1
-33
lines changed

support/docker/nerves_system_br/Dockerfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ ENV PATH=/home/nerves/bin:/home/nerves/.local/bin:$PATH \
4040
LANG=C.UTF-8 \
4141
LC_ALL=C.UTF-8
4242

43-
COPY setup-packages.sh /nerves/setup-packages.sh
44-
RUN chmod +x /nerves/setup-packages.sh
45-
4643
# Set time
4744
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
4845

@@ -52,15 +49,7 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8 C.UTF-8/' /etc/locale.gen
5249
locale-gen
5350

5451
# The container has no package lists, so need to update first
55-
RUN /nerves/setup-packages.sh && apt-get update -y -qq
56-
57-
# Install our i386 deps first, since they require special config in aarch64 envs
58-
RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \
59-
libc6:i386 \
60-
libncurses5:i386 \
61-
gcc-multilib \
62-
g++-multilib \
63-
libstdc++6:i386
52+
RUN apt-get update -y -qq
6453

6554
# Install Buildroot packages (see <Buildroot>/support/docker/DockerFile
6655
RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \

support/docker/nerves_system_br/setup-packages.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)