From 1141fc8cad1f316e98e84988fe0d148886a8e831 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 14 Sep 2021 22:38:52 -0400
Subject: [PATCH 01/21] Make opam init/install use parallelism

---
 tier2/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tier2/Dockerfile b/tier2/Dockerfile
index 0e598f3b..ee09e4bb 100644
--- a/tier2/Dockerfile
+++ b/tier2/Dockerfile
@@ -7,8 +7,8 @@ RUN apt-get update && \
     ( \
         apt-get install -y --no-install-recommends make m4 patch unzip libgmp-dev && \
         bash -c 'echo | sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --no-backup' && \
-        runuser -u judge -- opam init --shell-setup --disable-sandboxing && \
-        runuser -u judge -- opam install -y base core stdio zarith && \
+        runuser -u judge -- opam init --shell-setup --disable-sandboxing -j$(nproc) && \
+        runuser -u judge -- opam install -y -j$(nproc) base core stdio zarith && \
         runuser -u judge -- opam clean && rm -rf ~judge/.opam/repo \
     ) && \
     mkdir /opt/pypy2 && curl -L "$(curl https://www.pypy.org/download.html | grep /pypy2 | head -n1 | cut -d'"' -f4)" | \

From fd4483ef373f333faedf4dc10143358c5543627c Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 06:26:48 -0400
Subject: [PATCH 02/21] Pin Swift to 5.4.x

Swift 5.5 wants to use setpgid, which breaks the sandbox.
---
 tier3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 125ac678..9a514225 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -7,7 +7,7 @@ RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - &
         coffeescript gnucobol4 gnat gfortran tcl lua5.3 intercal php-cli dart/stable gforth swi-prolog pike8.0 sbcl && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir /opt/swift && \
-    curl "$(echo -n https://swift.org; curl -s https://swift.org/download/ | grep 'Ubuntu 18.04' | head -n 1 | cut -d'"' -f 2)" | \
+    curl "$(echo -n https://swift.org; curl -s https://swift.org/download/ | grep 'Ubuntu 18.04' | grep 5.4 | head -n 1 | cut -d'"' -f 2)" | \
         tar xz -C /opt/swift --strip-components=1 && \
     curl -L -ogroovy.zip "$(curl -s https://groovy.apache.org/download.html | perl -ne 'if(/(['"'"'"])(https:[^'"'"'"]+-binary-[\d.]+\.zip)\1/){print$2;exit}')" && \
         unzip groovy.zip && \

From 9d333ea126b91650bb91a70ec13dbfbc79c7b2d3 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Mon, 20 Sep 2021 00:58:53 -0400
Subject: [PATCH 03/21] Add arm64 docker build job

Only tier1 works, the other tiers need more work.
---
 .github/workflows/docker.yml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e7a9ee8c..fa6442f3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,9 @@ on:
   schedule:
     - cron: '0 0 * * 1'
 jobs:
-  build:
+  amd64:
+    permissions:
+      packages: write
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -50,3 +52,30 @@ jobs:
       env:
         CR_USER: ${{ secrets.CR_USER }}
         CR_PAT: ${{ secrets.CR_PAT }}
+
+  arm64:
+    permissions:
+      packages: write
+    runs-on: [self-hosted, Linux, ARM64]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build tier 1 Docker image
+      run: make TAG=aarch64-latest image-tier1
+    - name: Test tier 1 Docker image
+      run: make TAG=aarch64-latest test-tier1
+    - name: Push images to Docker
+      if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
+      run: |
+        echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+        docker push dmoj/runtimes-tier1:aarch64-latest
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Push images to GitHub Containers
+      if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
+      run: |
+        echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
+        docker push ghcr.io/dmoj/runtimes-tier1:aarch64-latest
+      env:
+        CR_USER: ${{ secrets.CR_USER }}
+        CR_PAT: ${{ secrets.CR_PAT }}

From 205f4a58c063f85301081608f6989fb7ec93e025 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 18:35:12 -0400
Subject: [PATCH 04/21] Install armhf binutils for GASARM

---
 tier1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tier1/Dockerfile b/tier1/Dockerfile
index a6aa18a5..00800c87 100644
--- a/tier1/Dockerfile
+++ b/tier1/Dockerfile
@@ -7,7 +7,7 @@ RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.
     apt-get update && \
     apt-get install -y --no-install-recommends \
         curl file gcc g++ python3-pip python3-dev python3-setuptools python3-wheel cython3 libseccomp-dev bzip2 gzip \
-        python2 fp-compiler libxtst6 tini && \
+        python2 fp-compiler libxtst6 tini $([ "$(arch)" = aarch64 ] && echo binutils-arm-linux-gnueabihf) && \
     apt-get install -y -t stretch --no-install-recommends openjdk-8-jdk-headless openjdk-8-jre-headless && \
     apt-get install -y -t experimental --no-install-recommends g++-11 && \
     rm -rf /var/lib/apt/lists/* && \

From 302bb1e7e084846fd98259decf5a18705b02ba56 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Mon, 20 Sep 2021 22:39:28 -0400
Subject: [PATCH 05/21] Make tier2 work with arm64

---
 .github/workflows/docker.yml |  6 ++++++
 tier2/Dockerfile             | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fa6442f3..e9beb009 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -63,11 +63,16 @@ jobs:
       run: make TAG=aarch64-latest image-tier1
     - name: Test tier 1 Docker image
       run: make TAG=aarch64-latest test-tier1
+    - name: Build tier 2 Docker image
+      run: make TAG=aarch64-latest image-tier2
+    - name: Test tier 2 Docker image
+      run: make TAG=aarch64-latest test-tier2
     - name: Push images to Docker
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
         docker push dmoj/runtimes-tier1:aarch64-latest
+        docker push dmoj/runtimes-tier2:aarch64-latest
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -76,6 +81,7 @@ jobs:
       run: |
         echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
         docker push ghcr.io/dmoj/runtimes-tier1:aarch64-latest
+        docker push ghcr.io/dmoj/runtimes-tier2:aarch64-latest
       env:
         CR_USER: ${{ secrets.CR_USER }}
         CR_PAT: ${{ secrets.CR_PAT }}
diff --git a/tier2/Dockerfile b/tier2/Dockerfile
index ee09e4bb..a5f2ea6b 100644
--- a/tier2/Dockerfile
+++ b/tier2/Dockerfile
@@ -3,7 +3,7 @@ FROM dmoj/runtimes-tier1
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         jq apt-transport-https dirmngr gnupg ca-certificates \
-        openjdk-17-jdk-headless clang ghc golang racket ruby scala nasm libc6-dev-i386 && \
+        openjdk-17-jdk-headless clang ghc golang racket ruby scala nasm $([ "$(arch)" = x86_64 ] && echo libc6-dev-i386) && \
     ( \
         apt-get install -y --no-install-recommends make m4 patch unzip libgmp-dev && \
         bash -c 'echo | sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --no-backup' && \
@@ -11,10 +11,11 @@ RUN apt-get update && \
         runuser -u judge -- opam install -y -j$(nproc) base core stdio zarith && \
         runuser -u judge -- opam clean && rm -rf ~judge/.opam/repo \
     ) && \
-    mkdir /opt/pypy2 && curl -L "$(curl https://www.pypy.org/download.html | grep /pypy2 | head -n1 | cut -d'"' -f4)" | \
+    if [ "$(arch)" = x86_64 ]; then PYPY_ARCH=linux64; else PYPY_ARCH="$(arch)"; fi && \
+    mkdir /opt/pypy2 && curl -L "$(curl https://www.pypy.org/download.html | grep "/pypy2.*$PYPY_ARCH" | head -n1 | cut -d'"' -f4)" | \
         tar xj -C /opt/pypy2 --strip-components=1 && /opt/pypy2/bin/pypy -mcompileall && \
     rm -f /opt/pypy2/bin/python* && \
-    mkdir /opt/pypy3 && curl -L "$(curl https://www.pypy.org/download.html | grep /pypy3 | head -n1 | cut -d'"' -f4)" | \
+    mkdir /opt/pypy3 && curl -L "$(curl https://www.pypy.org/download.html | grep "/pypy3.*$PYPY_ARCH" | head -n1 | cut -d'"' -f4)" | \
         tar xj -C /opt/pypy3 --strip-components=1 && /opt/pypy3/bin/pypy -mcompileall && \
     rm -f /opt/pypy3/bin/python* && \
     runuser judge -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y' && \
@@ -31,13 +32,13 @@ RUN apt-get update && \
             runuser -u judge /home/judge/.cargo/bin/cargo fetch \
         ) && \
         rm -rf rust && \
-    curl -L -odmd.deb "$(curl -s https://dlang.org/download.html | perl -ne 'if(/"([^"~]*_amd64.deb)/){print $1;exit}')" && \
-        apt install ./dmd.deb && rm dmd.deb && \
+    if [ "$(arch)" = x86_64 ]; then curl -L -odmd.deb "$(curl -s https://dlang.org/download.html | perl -ne 'if(/"([^"~]*_amd64.deb)/){print $1;exit}')" && \
+        apt install ./dmd.deb && rm dmd.deb; fi && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
     echo "deb https://download.mono-project.com/repo/debian stable-buster main" > \
         /etc/apt/sources.list.d/mono-official-stable.list && \
     curl https://dmoj.ca/dmoj-apt.key | apt-key add - && \
-    echo 'deb [arch=amd64] https://apt.dmoj.ca/ stretch main non-free' > /etc/apt/sources.list.d/dmoj.list && \
+    echo 'deb https://apt.dmoj.ca/ bullseye main' > /etc/apt/sources.list.d/dmoj.list && \
     (echo 'Package: *'; echo 'Pin: origin download.mono-project.com'; echo 'Pin-Priority: 990') > /etc/apt/preferences.d/mono && \
     apt-get update && \
     (cd /tmp && \

From 4bdfa63a461eb6d1f2e45a166bcb5b7db934c3ef Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 05:21:57 -0400
Subject: [PATCH 06/21] Make tier3 work with arm64

---
 .github/workflows/docker.yml |  6 ++++++
 tier3/Dockerfile             | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e9beb009..690514e3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -67,12 +67,17 @@ jobs:
       run: make TAG=aarch64-latest image-tier2
     - name: Test tier 2 Docker image
       run: make TAG=aarch64-latest test-tier2
+    - name: Build tier 3 Docker image
+      run: make TAG=aarch64-latest image-tier3
+    - name: Test tier 3 Docker image
+      run: make TAG=aarch64-latest test-tier3
     - name: Push images to Docker
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
         docker push dmoj/runtimes-tier1:aarch64-latest
         docker push dmoj/runtimes-tier2:aarch64-latest
+        docker push dmoj/runtimes-tier3:aarch64-latest
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -82,6 +87,7 @@ jobs:
         echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
         docker push ghcr.io/dmoj/runtimes-tier1:aarch64-latest
         docker push ghcr.io/dmoj/runtimes-tier2:aarch64-latest
+        docker push ghcr.io/dmoj/runtimes-tier3:aarch64-latest
       env:
         CR_USER: ${{ secrets.CR_USER }}
         CR_PAT: ${{ secrets.CR_PAT }}
diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 9a514225..ddeda597 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -1,14 +1,19 @@
 FROM dmoj/runtimes-tier2
 
-RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    echo 'deb [arch=amd64] https://storage.googleapis.com/download.dartlang.org/linux/debian stable main' > /etc/apt/sources.list.d/dart.list && \
+RUN (cd /opt && \
+        case "$(arch)" in x86_64) DART_ARCH=x64;; aarch64) DART_ARCH=arm64;; *) false;; esac && \
+        curl -L -odart.zip "https://storage.googleapis.com/dart-archive/channels/stable/release/$( \
+            curl -sSL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | jq -r .version \
+        )/sdk/dartsdk-linux-$DART_ARCH-release.zip" && \
+        unzip dart.zip && find /opt/dart-sdk -type d -exec chmod go+rx {} + && rm dart.zip) && \
     apt-get update && \
     apt-get install -y --no-install-recommends unzip libtinfo5 xz-utils \
-        coffeescript gnucobol4 gnat gfortran tcl lua5.3 intercal php-cli dart/stable gforth swi-prolog pike8.0 sbcl && \
+        coffeescript gnucobol4 gnat gfortran tcl lua5.3 intercal php-cli gforth swi-prolog pike8.0 sbcl && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir /opt/swift && \
-    curl "$(echo -n https://swift.org; curl -s https://swift.org/download/ | grep 'Ubuntu 18.04' | grep 5.4 | head -n 1 | cut -d'"' -f 2)" | \
-        tar xz -C /opt/swift --strip-components=1 && \
+    if [ "$(arch)" = x86_64 ]; then \
+        curl "https://swift.org$(curl -s https://swift.org/download/ | grep 'Ubuntu 18.04' | grep 5.4 | head -n 1 | cut -d'"' -f 2)" | \
+            tar xz -C /opt/swift --strip-components=1; fi && \
     curl -L -ogroovy.zip "$(curl -s https://groovy.apache.org/download.html | perl -ne 'if(/(['"'"'"])(https:[^'"'"'"]+-binary-[\d.]+\.zip)\1/){print$2;exit}')" && \
         unzip groovy.zip && \
         mkdir /opt/groovy && \
@@ -17,9 +22,10 @@ RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - &
     curl -L -okotlin.zip "$(curl -s https://api.github.com/repos/JetBrains/kotlin/releases | \
             jq -r '[.[] | select(.prerelease | not) | .assets | flatten | .[] | select(.name | startswith("kotlin-compiler")) | .browser_download_url][0]')" && \
         unzip kotlin.zip && mv kotlinc /opt/kotlin && rm kotlin.zip && \
-    curl -L -otprolog.zip "https://github.com/yingted/OpenTuring/releases/download/v1.0.0-beta/tprolog-v1.0.0-beta.zip" && \
-        unzip tprolog.zip && mv tprolog /opt && rm tprolog.zip && \
+    if [ "$(arch)" = x86_64 ]; then \
+        curl -L -otprolog.zip "https://github.com/yingted/OpenTuring/releases/download/v1.0.0-beta/tprolog-v1.0.0-beta.zip" && \
+            unzip tprolog.zip && mv tprolog /opt && rm tprolog.zip; fi && \
     mkdir /opt/zig && \
-        curl "https://ziglang.org/download/0.6.0/zig-linux-x86_64-0.6.0.tar.xz" | tar xJ -C /opt/zig  --strip-components=1
+        curl "https://ziglang.org/download/0.6.0/zig-linux-$(arch)-0.6.0.tar.xz" | tar xJ -C /opt/zig --strip-components=1
 
-ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:${PATH}:/opt/swift/usr/bin:/opt/zig"
+ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig"

From 86eefbf7b2ecb2fea162c95fd8220cff8d71ff6c Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 19:49:34 -0400
Subject: [PATCH 07/21] Separate manifest job and use build matrix

---
 .github/workflows/docker.yml | 94 ++++++++++++++----------------------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 690514e3..e546a37d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,40 +5,38 @@ on:
   schedule:
     - cron: '0 0 * * 1'
 jobs:
-  amd64:
+  build:
     permissions:
       packages: write
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch:
+          - tag: amd64-latest
+            runner: ubuntu-latest
+          - tag: aarch64-latest
+            runner: [self-hosted, Linux, ARM64]
+    runs-on: ${{ matrix.arch.runner }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build tier 1 Docker image
-      run: make TAG=amd64-latest image-tier1
+      run: make TAG=${{ matrix.arch.tag }} image-tier1
     - name: Test tier 1 Docker image
-      run: make TAG=amd64-latest test-tier1
+      run: make TAG=${{ matrix.arch.tag }} test-tier1
     - name: Build tier 2 Docker image
-      run: make TAG=amd64-latest image-tier2
+      run: make TAG=${{ matrix.arch.tag }} image-tier2
     - name: Test tier 2 Docker image
-      run: make TAG=amd64-latest test-tier2
+      run: make TAG=${{ matrix.arch.tag }} test-tier2
     - name: Build tier 3 Docker image
-      run: make TAG=amd64-latest image-tier3
+      run: make TAG=${{ matrix.arch.tag }} image-tier3
     - name: Test tier 3 Docker image
-      run: make TAG=amd64-latest test-tier3
+      run: make TAG=${{ matrix.arch.tag }} test-tier3
     - name: Push images to Docker
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-        docker push dmoj/runtimes-tier1:amd64-latest
-        docker push dmoj/runtimes-tier2:amd64-latest
-        docker push dmoj/runtimes-tier3:amd64-latest
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier1/manifest.yml
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier2/manifest.yml
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier3/manifest.yml
+        docker push dmoj/runtimes-tier1:${{ matrix.arch.tag }}
+        docker push dmoj/runtimes-tier2:${{ matrix.arch.tag }}
+        docker push dmoj/runtimes-tier3:${{ matrix.arch.tag }}
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -46,48 +44,30 @@ jobs:
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
-        docker push ghcr.io/dmoj/runtimes-tier1:amd64-latest
-        docker push ghcr.io/dmoj/runtimes-tier2:amd64-latest
-        docker push ghcr.io/dmoj/runtimes-tier3:amd64-latest
+        docker push ghcr.io/dmoj/runtimes-tier1:${{ matrix.arch.tag }}
+        docker push ghcr.io/dmoj/runtimes-tier2:${{ matrix.arch.tag }}
+        docker push ghcr.io/dmoj/runtimes-tier3:${{ matrix.arch.tag }}
       env:
         CR_USER: ${{ secrets.CR_USER }}
         CR_PAT: ${{ secrets.CR_PAT }}
 
-  arm64:
-    permissions:
-      packages: write
-    runs-on: [self-hosted, Linux, ARM64]
+  manifest:
+    if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
+    needs: build
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Build tier 1 Docker image
-      run: make TAG=aarch64-latest image-tier1
-    - name: Test tier 1 Docker image
-      run: make TAG=aarch64-latest test-tier1
-    - name: Build tier 2 Docker image
-      run: make TAG=aarch64-latest image-tier2
-    - name: Test tier 2 Docker image
-      run: make TAG=aarch64-latest test-tier2
-    - name: Build tier 3 Docker image
-      run: make TAG=aarch64-latest image-tier3
-    - name: Test tier 3 Docker image
-      run: make TAG=aarch64-latest test-tier3
-    - name: Push images to Docker
-      if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
+    - uses: actions/checkout@v2
+    - name: Update Docker Hub Manifests
       run: |
-        echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-        docker push dmoj/runtimes-tier1:aarch64-latest
-        docker push dmoj/runtimes-tier2:aarch64-latest
-        docker push dmoj/runtimes-tier3:aarch64-latest
+        docker run -v "$(pwd)":/code mplatform/manifest-tool \
+          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
+          push from-spec /code/tier1/manifest.yml
+        docker run -v "$(pwd)":/code mplatform/manifest-tool \
+          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
+          push from-spec /code/tier2/manifest.yml
+        docker run -v "$(pwd)":/code mplatform/manifest-tool \
+          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
+          push from-spec /code/tier3/manifest.yml
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Push images to GitHub Containers
-      if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
-      run: |
-        echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
-        docker push ghcr.io/dmoj/runtimes-tier1:aarch64-latest
-        docker push ghcr.io/dmoj/runtimes-tier2:aarch64-latest
-        docker push ghcr.io/dmoj/runtimes-tier3:aarch64-latest
-      env:
-        CR_USER: ${{ secrets.CR_USER }}
-        CR_PAT: ${{ secrets.CR_PAT }}

From b39ed0ebab500181a2a04387c8ad4d86b46c4250 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 20:01:41 -0400
Subject: [PATCH 08/21] Refactor manifest building to use docker manifest

---
 .github/workflows/docker.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e546a37d..c17193fe 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -59,15 +59,15 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update Docker Hub Manifests
       run: |
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier1/manifest.yml
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier2/manifest.yml
-        docker run -v "$(pwd)":/code mplatform/manifest-tool \
-          --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD" \
-          push from-spec /code/tier3/manifest.yml
+        echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+        for tier in tier{1..3}; do
+          args=()
+          for arch in amd64 aarch64; do
+            args+=(--amend "dmoj/runtimes-$tier:$arch-latest")
+          done
+          docker manifest create "dmoj/runtimes-$tier:latest" "${args[@]}"
+          docker manifest push "dmoj/runtimes-$tier:latest"
+        done
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

From 454b78db17740703aac6dac2f73e317b8d20192a Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 20:06:11 -0400
Subject: [PATCH 09/21] Push manifests to GitHub container registry

---
 .github/workflows/docker.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c17193fe..848c82a4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -71,3 +71,17 @@ jobs:
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Push images to GitHub Containers
+      run: |
+        echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
+        for tier in tier{1..3}; do
+          args=()
+          for arch in amd64 aarch64; do
+            args+=(--amend "ghcr.io/dmoj/runtimes-$tier:$arch-latest")
+          done
+          docker manifest create "ghcr.io/dmoj/runtimes-$tier:latest" "${args[@]}"
+          docker manifest push "ghcr.io/dmoj/runtimes-$tier:latest"
+        done
+      env:
+        CR_USER: ${{ secrets.CR_USER }}
+        CR_PAT: ${{ secrets.CR_PAT }}

From cac085a368f0aeb03b885650ec71528af2ae7772 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 20:15:33 -0400
Subject: [PATCH 10/21] Use GITHUB_TOKEN instead of PATs for container registry

---
 .github/workflows/docker.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 848c82a4..446a8148 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -48,10 +48,12 @@ jobs:
         docker push ghcr.io/dmoj/runtimes-tier2:${{ matrix.arch.tag }}
         docker push ghcr.io/dmoj/runtimes-tier3:${{ matrix.arch.tag }}
       env:
-        CR_USER: ${{ secrets.CR_USER }}
-        CR_PAT: ${{ secrets.CR_PAT }}
+        CR_USER: ${{ github.actor }}
+        CR_PAT: ${{ secrets.GITHUB_TOKEN }}
 
   manifest:
+    permissions:
+      packages: write
     if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
     needs: build
     runs-on: ubuntu-latest
@@ -83,5 +85,5 @@ jobs:
           docker manifest push "ghcr.io/dmoj/runtimes-$tier:latest"
         done
       env:
-        CR_USER: ${{ secrets.CR_USER }}
-        CR_PAT: ${{ secrets.CR_PAT }}
+        CR_USER: ${{ github.actor }}
+        CR_PAT: ${{ secrets.GITHUB_TOKEN }}

From ba4feb61e5fb99fd028e1c46b076f17b94cf808d Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Tue, 21 Sep 2021 23:39:48 -0400
Subject: [PATCH 11/21] Rename build actions to sound less silly

---
 .github/workflows/docker.yml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 446a8148..a08bf0af 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -10,33 +10,36 @@ jobs:
       packages: write
     strategy:
       matrix:
-        arch:
-          - tag: amd64-latest
+        arch: [ amd64, arm64 ]
+        include:
+          - arch: amd64
+            tag: amd64-latest
             runner: ubuntu-latest
-          - tag: aarch64-latest
+          - arch: arm64
+            tag: aarch64-latest
             runner: [self-hosted, Linux, ARM64]
-    runs-on: ${{ matrix.arch.runner }}
+    runs-on: ${{ matrix.runner }}
     steps:
     - uses: actions/checkout@v2
     - name: Build tier 1 Docker image
-      run: make TAG=${{ matrix.arch.tag }} image-tier1
+      run: make TAG=${{ matrix.tag }} image-tier1
     - name: Test tier 1 Docker image
-      run: make TAG=${{ matrix.arch.tag }} test-tier1
+      run: make TAG=${{ matrix.tag }} test-tier1
     - name: Build tier 2 Docker image
-      run: make TAG=${{ matrix.arch.tag }} image-tier2
+      run: make TAG=${{ matrix.tag }} image-tier2
     - name: Test tier 2 Docker image
-      run: make TAG=${{ matrix.arch.tag }} test-tier2
+      run: make TAG=${{ matrix.tag }} test-tier2
     - name: Build tier 3 Docker image
-      run: make TAG=${{ matrix.arch.tag }} image-tier3
+      run: make TAG=${{ matrix.tag }} image-tier3
     - name: Test tier 3 Docker image
-      run: make TAG=${{ matrix.arch.tag }} test-tier3
+      run: make TAG=${{ matrix.tag }} test-tier3
     - name: Push images to Docker
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-        docker push dmoj/runtimes-tier1:${{ matrix.arch.tag }}
-        docker push dmoj/runtimes-tier2:${{ matrix.arch.tag }}
-        docker push dmoj/runtimes-tier3:${{ matrix.arch.tag }}
+        docker push dmoj/runtimes-tier1:${{ matrix.tag }}
+        docker push dmoj/runtimes-tier2:${{ matrix.tag }}
+        docker push dmoj/runtimes-tier3:${{ matrix.tag }}
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -44,9 +47,9 @@ jobs:
       if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
       run: |
         echo "$CR_PAT" | docker login ghcr.io -u "$CR_USER" --password-stdin
-        docker push ghcr.io/dmoj/runtimes-tier1:${{ matrix.arch.tag }}
-        docker push ghcr.io/dmoj/runtimes-tier2:${{ matrix.arch.tag }}
-        docker push ghcr.io/dmoj/runtimes-tier3:${{ matrix.arch.tag }}
+        docker push ghcr.io/dmoj/runtimes-tier1:${{ matrix.tag }}
+        docker push ghcr.io/dmoj/runtimes-tier2:${{ matrix.tag }}
+        docker push ghcr.io/dmoj/runtimes-tier3:${{ matrix.tag }}
       env:
         CR_USER: ${{ github.actor }}
         CR_PAT: ${{ secrets.GITHUB_TOKEN }}

From 61e0e63a78b4f2074bdc867d664e8260a231695c Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Fri, 8 Oct 2021 02:07:57 -0400
Subject: [PATCH 12/21] Include libffi8 in tier1 image

---
 tier1/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tier1/Dockerfile b/tier1/Dockerfile
index 00800c87..a6670a84 100644
--- a/tier1/Dockerfile
+++ b/tier1/Dockerfile
@@ -7,7 +7,7 @@ RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.
     apt-get update && \
     apt-get install -y --no-install-recommends \
         curl file gcc g++ python3-pip python3-dev python3-setuptools python3-wheel cython3 libseccomp-dev bzip2 gzip \
-        python2 fp-compiler libxtst6 tini $([ "$(arch)" = aarch64 ] && echo binutils-arm-linux-gnueabihf) && \
+        python2 fp-compiler libxtst6 libffi8 tini $([ "$(arch)" = aarch64 ] && echo binutils-arm-linux-gnueabihf) && \
     apt-get install -y -t stretch --no-install-recommends openjdk-8-jdk-headless openjdk-8-jre-headless && \
     apt-get install -y -t experimental --no-install-recommends g++-11 && \
     rm -rf /var/lib/apt/lists/* && \

From b048d2dc7f26216f9686d6c38ca48230a68f88b5 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Mon, 20 Dec 2021 20:44:54 -0500
Subject: [PATCH 13/21] Deal with broken Swift download

Swift apparently just sends compressed data even when the client
doesn't ask for it.
---
 tier3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index ddeda597..5961a56d 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -12,7 +12,7 @@ RUN (cd /opt && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir /opt/swift && \
     if [ "$(arch)" = x86_64 ]; then \
-        curl "https://swift.org$(curl -s https://swift.org/download/ | grep 'Ubuntu 18.04' | grep 5.4 | head -n 1 | cut -d'"' -f 2)" | \
+        curl --compressed -L "$(curl --compressed -sL https://swift.org/download/ | grep 'Ubuntu 18.04' | grep 5.4 | head -n 1 | cut -d'"' -f 2)" | \
             tar xz -C /opt/swift --strip-components=1; fi && \
     curl -L -ogroovy.zip "$(curl -s https://groovy.apache.org/download.html | perl -ne 'if(/(['"'"'"])(https:[^'"'"'"]+-binary-[\d.]+\.zip)\1/){print$2;exit}')" && \
         unzip groovy.zip && \

From ad6a42d9f766392987ff9702d7614dc4a86c5a71 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Wed, 29 Dec 2021 15:12:39 -0500
Subject: [PATCH 14/21] Work around pip bug

---
 test/run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run b/test/run
index 036f5e3e..47278081 100755
--- a/test/run
+++ b/test/run
@@ -3,5 +3,6 @@ mkdir /judge
 cd /judge || exit
 curl -L https://github.com/DMOJ/judge/archive/master.tar.gz | tar -xz --strip-components=1
 pip3 install -e .
+python3 setup.py develop
 . ~judge/.profile
 runuser -u judge -w PATH -- bash -c '. ~/.profile; dmoj-autoconf -V'

From c8e1834135a6ad778dd9058d1546137d137af328 Mon Sep 17 00:00:00 2001
From: int-y1 <jason_yuen2007@hotmail.com>
Date: Tue, 4 Jan 2022 04:37:34 -0500
Subject: [PATCH 15/21] Install Lean 4

---
 tier3/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 5961a56d..33ed366d 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -26,6 +26,9 @@ RUN (cd /opt && \
         curl -L -otprolog.zip "https://github.com/yingted/OpenTuring/releases/download/v1.0.0-beta/tprolog-v1.0.0-beta.zip" && \
             unzip tprolog.zip && mv tprolog /opt && rm tprolog.zip; fi && \
     mkdir /opt/zig && \
-        curl "https://ziglang.org/download/0.6.0/zig-linux-$(arch)-0.6.0.tar.xz" | tar xJ -C /opt/zig --strip-components=1
+        curl "https://ziglang.org/download/0.6.0/zig-linux-$(arch)-0.6.0.tar.xz" | tar xJ -C /opt/zig --strip-components=1 && \
+    mkdir /opt/lean && \
+        curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
+        tar xz -C /opt/lean --strip-components=1
 
-ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig"
+ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From 33fe3adfa76d5523beb5fb8c3c756fc1f237b4df Mon Sep 17 00:00:00 2001
From: int-y1 <jason_yuen2007@hotmail.com>
Date: Fri, 7 Jan 2022 04:32:21 -0500
Subject: [PATCH 16/21] Only install Lean 4 on amd64

---
 tier3/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 33ed366d..c366e40a 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -27,8 +27,9 @@ RUN (cd /opt && \
             unzip tprolog.zip && mv tprolog /opt && rm tprolog.zip; fi && \
     mkdir /opt/zig && \
         curl "https://ziglang.org/download/0.6.0/zig-linux-$(arch)-0.6.0.tar.xz" | tar xJ -C /opt/zig --strip-components=1 && \
-    mkdir /opt/lean && \
+    if [ "$(arch)" = x86_64 ]; then \
+        mkdir /opt/lean && \
         curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
-        tar xz -C /opt/lean --strip-components=1
+        tar xz -C /opt/lean --strip-components=1; fi
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From 784e932a85079eff02bedc0df7b2c6942b194d2a Mon Sep 17 00:00:00 2001
From: Tim Bussmann <timbussmann@users.noreply.github.com>
Date: Sun, 22 May 2022 18:24:22 +0200
Subject: [PATCH 17/21] install dotnet 6 SDK

using APT packages
---
 tier3/Dockerfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index c366e40a..79e34b14 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -30,6 +30,13 @@ RUN (cd /opt && \
     if [ "$(arch)" = x86_64 ]; then \
         mkdir /opt/lean && \
         curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
-        tar xz -C /opt/lean --strip-components=1; fi
+        tar xz -C /opt/lean --strip-components=1; fi && \
+    curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    rm packages-microsoft-prod.deb && \
+    apt-get update; \
+    apt-get install -y apt-transport-https && \
+    apt-get update && \
+    apt-get install -y dotnet-sdk-6.0
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From 1f5de61059d6ce3fcc6cd45f1b249bc6b0cd81ba Mon Sep 17 00:00:00 2001
From: Tim Bussmann <timbussmann@users.noreply.github.com>
Date: Wed, 1 Jun 2022 23:26:07 +0200
Subject: [PATCH 18/21] remove installation of already installed
 apt-transport-https package

---
 tier3/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 79e34b14..95968640 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -35,8 +35,6 @@ RUN (cd /opt && \
     dpkg -i packages-microsoft-prod.deb && \
     rm packages-microsoft-prod.deb && \
     apt-get update; \
-    apt-get install -y apt-transport-https && \
-    apt-get update && \
     apt-get install -y dotnet-sdk-6.0
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From 2bc5c2a7dee3c9b16e04e8a331d74c704953fa4d Mon Sep 17 00:00:00 2001
From: Tim Bussmann <timbussmann@users.noreply.github.com>
Date: Thu, 2 Jun 2022 00:29:45 +0200
Subject: [PATCH 19/21] add conditional for ARM

---
 tier3/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 95968640..daf6496e 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -31,10 +31,11 @@ RUN (cd /opt && \
         mkdir /opt/lean && \
         curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
         tar xz -C /opt/lean --strip-components=1; fi && \
-    curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
-    dpkg -i packages-microsoft-prod.deb && \
-    rm packages-microsoft-prod.deb && \
-    apt-get update; \
-    apt-get install -y dotnet-sdk-6.0
+    if [ "$(arch)" = x86_64 ]; then \
+        curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
+        dpkg -i packages-microsoft-prod.deb && \
+        rm packages-microsoft-prod.deb && \
+        apt-get update; \
+        apt-get install -y dotnet-sdk-6.0; fi
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From 1bb9183e5538a072349390b4f7b4a90b7305eba8 Mon Sep 17 00:00:00 2001
From: Tim Bussmann <timbussmann@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:36:29 +0200
Subject: [PATCH 20/21] remove conditional installation

---
 tier3/Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index daf6496e..08178854 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -31,11 +31,10 @@ RUN (cd /opt && \
         mkdir /opt/lean && \
         curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
         tar xz -C /opt/lean --strip-components=1; fi && \
-    if [ "$(arch)" = x86_64 ]; then \
-        curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
-        dpkg -i packages-microsoft-prod.deb && \
-        rm packages-microsoft-prod.deb && \
-        apt-get update; \
-        apt-get install -y dotnet-sdk-6.0; fi
+    curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    rm packages-microsoft-prod.deb && \
+    apt-get update && \
+    apt-get install -y dotnet-sdk-6.0
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

From b12bd92494a4b64344fdeee340cae8bef225e8a3 Mon Sep 17 00:00:00 2001
From: Tim Bussmann <timbussmann@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:14:48 +0200
Subject: [PATCH 21/21] frontload dotnet installation

---
 tier3/Dockerfile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tier3/Dockerfile b/tier3/Dockerfile
index 08178854..df3e05d6 100644
--- a/tier3/Dockerfile
+++ b/tier3/Dockerfile
@@ -6,9 +6,12 @@ RUN (cd /opt && \
             curl -sSL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | jq -r .version \
         )/sdk/dartsdk-linux-$DART_ARCH-release.zip" && \
         unzip dart.zip && find /opt/dart-sdk -type d -exec chmod go+rx {} + && rm dart.zip) && \
+    curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    rm packages-microsoft-prod.deb && \
     apt-get update && \
     apt-get install -y --no-install-recommends unzip libtinfo5 xz-utils \
-        coffeescript gnucobol4 gnat gfortran tcl lua5.3 intercal php-cli gforth swi-prolog pike8.0 sbcl && \
+        coffeescript gnucobol4 gnat gfortran tcl lua5.3 intercal php-cli gforth swi-prolog pike8.0 sbcl dotnet-sdk-6.0 && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir /opt/swift && \
     if [ "$(arch)" = x86_64 ]; then \
@@ -30,11 +33,6 @@ RUN (cd /opt && \
     if [ "$(arch)" = x86_64 ]; then \
         mkdir /opt/lean && \
         curl --compressed -L "https://github.com/leanprover/lean4/releases/download/v4.0.0-m2/lean-4.0.0-m2-linux.tar.gz" | \
-        tar xz -C /opt/lean --strip-components=1; fi && \
-    curl "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" --output packages-microsoft-prod.deb && \
-    dpkg -i packages-microsoft-prod.deb && \
-    rm packages-microsoft-prod.deb && \
-    apt-get update && \
-    apt-get install -y dotnet-sdk-6.0
+        tar xz -C /opt/lean --strip-components=1; fi
 
 ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:/opt/dart-sdk/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"