From 5a055db02e7ded2e23ad857df1e78f65e2af6d96 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 23 Oct 2021 20:49:47 +1000
Subject: [PATCH] fix broken build on case-insensitive filesystems; sort Docker
 deps

---
 scripts/docker/Dockerfile.amd64    | 17 ++++++++---------
 scripts/docker/Dockerfile.arm64    | 20 +++++++++-----------
 scripts/docker/README.md           |  2 +-
 scripts/docker/{build => build.sh} |  0
 4 files changed, 18 insertions(+), 21 deletions(-)
 rename scripts/docker/{build => build.sh} (100%)

diff --git a/scripts/docker/Dockerfile.amd64 b/scripts/docker/Dockerfile.amd64
index f130acc69..6921c278a 100644
--- a/scripts/docker/Dockerfile.amd64
+++ b/scripts/docker/Dockerfile.amd64
@@ -7,7 +7,7 @@ ARG gid=1000
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
     bash \
-    curl \
+    ca-certificates \
     curl \
     findutils \
     g++ \
@@ -15,28 +15,27 @@ RUN apt-get update \
     git \
     grep \
     libdbus-1-3 \
+    libegl1 \
     libfontconfig1 \
     libgl1 \
+    libgstreamer-gl1.0-0 \
+    libgstreamer-plugins-base1.0 \
+    libgstreamer1.0-0 \
     libnss3 \
     libpulse-mainloop-glib0 \    
+    libssl-dev \
     libxcomposite1 \
     libxcursor1 \
     libxi6 \
     libxkbcommon-x11-0 \
     libxkbcommon0 \
+    libxkbfile1	\
     libxrandr2 \
     libxrender1 \
     libxtst6 \
+    pkg-config \
     portaudio19-dev \
     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/*
 
 RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 \
diff --git a/scripts/docker/Dockerfile.arm64 b/scripts/docker/Dockerfile.arm64
index c177b2dac..06c3525ec 100644
--- a/scripts/docker/Dockerfile.arm64
+++ b/scripts/docker/Dockerfile.arm64
@@ -6,9 +6,8 @@ ARG gid=1000
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
-    python-is-python3 \
     bash \
-    curl \
+    ca-certificates \
     curl \
     findutils \
     g++ \
@@ -16,31 +15,30 @@ RUN apt-get update \
     git \
     grep \
     libdbus-1-3 \
+    libegl1 \
     libfontconfig1 \
     libgl1 \
+    libgstreamer-gl1.0-0 \
+    libgstreamer-plugins-base1.0 \
+    libgstreamer1.0-0 \
     libnss3 \
     libpulse-mainloop-glib0 \    
+    libssl-dev \
     libxcomposite1 \
     libxcursor1 \
     libxi6 \
     libxkbcommon-x11-0 \
     libxkbcommon0 \
+    libxkbfile1	\
     libxrandr2 \
     libxrender1 \
     libxtst6 \
+    pkg-config \
     portaudio19-dev \
     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
-    python-is-python3 \
     clang-format \
+    python-is-python3 \
     python3-pyqt5.qtwebengine \
     # -- end only required for arm64/debian11
     && rm -rf /var/lib/apt/lists/*
diff --git a/scripts/docker/README.md b/scripts/docker/README.md
index a1447b628..83d02658b 100644
--- a/scripts/docker/README.md
+++ b/scripts/docker/README.md
@@ -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:
 
 ```
-$ scripts/docker/build amd64
+$ scripts/docker/build.sh amd64
 ```
 
 The resulting wheels will be written into bazel-dist. See
diff --git a/scripts/docker/build b/scripts/docker/build.sh
similarity index 100%
rename from scripts/docker/build
rename to scripts/docker/build.sh