fix broken build on case-insensitive filesystems; sort Docker deps

This commit is contained in:
Damien Elmes 2021-10-23 20:49:47 +10:00
parent ab01677ff1
commit 5a055db02e
4 changed files with 18 additions and 21 deletions

View file

@ -7,7 +7,7 @@ ARG gid=1000
RUN apt-get update \ RUN apt-get update \
&& apt-get install --yes --no-install-recommends \ && apt-get install --yes --no-install-recommends \
bash \ bash \
curl \ ca-certificates \
curl \ curl \
findutils \ findutils \
g++ \ g++ \
@ -15,28 +15,27 @@ RUN apt-get update \
git \ git \
grep \ grep \
libdbus-1-3 \ libdbus-1-3 \
libegl1 \
libfontconfig1 \ libfontconfig1 \
libgl1 \ libgl1 \
libgstreamer-gl1.0-0 \
libgstreamer-plugins-base1.0 \
libgstreamer1.0-0 \
libnss3 \ libnss3 \
libpulse-mainloop-glib0 \ libpulse-mainloop-glib0 \
libssl-dev \
libxcomposite1 \ libxcomposite1 \
libxcursor1 \ libxcursor1 \
libxi6 \ libxi6 \
libxkbcommon-x11-0 \ libxkbcommon-x11-0 \
libxkbcommon0 \ libxkbcommon0 \
libxkbfile1 \
libxrandr2 \ libxrandr2 \
libxrender1 \ libxrender1 \
libxtst6 \ libxtst6 \
pkg-config \
portaudio19-dev \ portaudio19-dev \
rsync \ rsync \
pkg-config \
libssl-dev \
libegl1 \
libxkbfile1 \
libgstreamer1.0-0 \
libgstreamer-plugins-base1.0 \
libgstreamer-gl1.0-0 \
ca-certificates \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 \ RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 \

View file

@ -6,9 +6,8 @@ ARG gid=1000
RUN apt-get update \ RUN apt-get update \
&& apt-get install --yes --no-install-recommends \ && apt-get install --yes --no-install-recommends \
python-is-python3 \
bash \ bash \
curl \ ca-certificates \
curl \ curl \
findutils \ findutils \
g++ \ g++ \
@ -16,31 +15,30 @@ RUN apt-get update \
git \ git \
grep \ grep \
libdbus-1-3 \ libdbus-1-3 \
libegl1 \
libfontconfig1 \ libfontconfig1 \
libgl1 \ libgl1 \
libgstreamer-gl1.0-0 \
libgstreamer-plugins-base1.0 \
libgstreamer1.0-0 \
libnss3 \ libnss3 \
libpulse-mainloop-glib0 \ libpulse-mainloop-glib0 \
libssl-dev \
libxcomposite1 \ libxcomposite1 \
libxcursor1 \ libxcursor1 \
libxi6 \ libxi6 \
libxkbcommon-x11-0 \ libxkbcommon-x11-0 \
libxkbcommon0 \ libxkbcommon0 \
libxkbfile1 \
libxrandr2 \ libxrandr2 \
libxrender1 \ libxrender1 \
libxtst6 \ libxtst6 \
pkg-config \
portaudio19-dev \ portaudio19-dev \
rsync \ rsync \
pkg-config \
libssl-dev \
libegl1 \
libxkbfile1 \
libgstreamer1.0-0 \
libgstreamer-plugins-base1.0 \
libgstreamer-gl1.0-0 \
ca-certificates \
# -- begin only required for arm64/debian11 # -- begin only required for arm64/debian11
python-is-python3 \
clang-format \ clang-format \
python-is-python3 \
python3-pyqt5.qtwebengine \ python3-pyqt5.qtwebengine \
# -- end only required for arm64/debian11 # -- end only required for arm64/debian11
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -19,7 +19,7 @@ Ensure Docker is installed on your machine, and your user has permission to conn
to Docker. Then run the following command from the root folder of this source repo: to Docker. Then run the following command from the root folder of this source repo:
``` ```
$ scripts/docker/build amd64 $ scripts/docker/build.sh amd64
``` ```
The resulting wheels will be written into bazel-dist. See The resulting wheels will be written into bazel-dist. See