Skip to content

Commit 1773ff4

Browse files
committed
Revert "attempt to fix build thing"
This reverts commit 8255622.
1 parent 8255622 commit 1773ff4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tools/docker-env/linux-gnu-crossbuild-i686.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ FROM debian:oldstable
22

33
# Create Debian Buster (glibc 2.28) image for cross-building i686 linux GNU binaries
44

5-
RUN groupadd -g 911 build \
6-
&& useradd -mN -u 911 -g 911 build
7-
85
RUN dpkg --add-architecture i386 \
96
&& apt-get update \
107
&& DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends \
@@ -18,6 +15,9 @@ RUN dpkg --add-architecture i386 \
1815
RUN wget -O- "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-linux-$(uname -m).tar.gz" \
1916
| tar -xz --strip-components=1 -C /
2017

18+
RUN groupadd -g 911 build \
19+
&& useradd -mN -u 911 -g 911 build
20+
2121
RUN test -f /usr/bin/python || ln -s /usr/bin/python3 /usr/bin/python
2222

2323
COPY --chmod=700 entrypoint.sh /entrypoint.sh

tools/docker-env/linux-gnu.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ FROM debian:oldstable
22

33
# Create Debian Buster (glibc 2.28) image for building linux GNU binaries
44

5-
RUN groupadd -g 911 build \
6-
&& useradd -mN -u 911 -g 911 build
7-
85
RUN apt-get update \
96
&& DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends \
107
build-essential \
@@ -16,6 +13,9 @@ RUN apt-get update \
1613
RUN wget -O- "https://github.com/Kitware/CMake/releases/download/v3.27.8/cmake-3.27.8-linux-$(uname -m).tar.gz" \
1714
| tar -xz --strip-components=1 -C /
1815

16+
RUN groupadd -g 911 build \
17+
&& useradd -mN -u 911 -g 911 build
18+
1919
RUN test -f /usr/bin/python || ln -s /usr/bin/python3 /usr/bin/python
2020

2121
COPY --chmod=700 entrypoint.sh /entrypoint.sh

0 commit comments

Comments
 (0)