From b052b1b82c8ffb3560eae223455ff0c9552124b3 Mon Sep 17 00:00:00 2001
From: Daiki Mizukami <tesaguriguma@gmail.com>
Date: Mon, 24 Jul 2023 18:14:57 +0900
Subject: [PATCH] CI: Update `Dockerfile` to install OpenSSL 3

The custom container is no longer required since the upstream image has
removed (the old version of) OpenSSL entirely.
---
 .github/workflows/build-containers.yml        |  9 ++++----
 docker/aarch64-unknown-linux-gnu/Dockerfile   | 10 +++------
 .../armv7-unknown-linux-gnueabihf/Dockerfile  | 10 +++------
 docker/install_packages.sh                    | 21 +++++++++++++++++++
 4 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100755 docker/install_packages.sh

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 8f3afec..d572610 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -12,16 +12,17 @@ jobs:
           - aarch64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabihf
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Log into registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
-        context: docker/${{ matrix.target }}
+        context: docker
+        file: docker/${{ matrix.target }}/Dockerfile
         push: true
         tags: ghcr.io/tesaguri/pipitor/cross:${{ matrix.target }}
diff --git a/docker/aarch64-unknown-linux-gnu/Dockerfile b/docker/aarch64-unknown-linux-gnu/Dockerfile
index a8d053d..69314f4 100644
--- a/docker/aarch64-unknown-linux-gnu/Dockerfile
+++ b/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,8 +1,4 @@
-FROM ghcr.io/tesaguri/cross:aarch64-unknown-linux-gnu
+FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:latest
 
-RUN dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:arm64 libssl-dev:arm64
-
-ENV PKG_CONFIG_ALLOW_CROSS_aarch64_unknown_linux_gnu=1 \
-    PKG_CONFIG_PATH_aarch64_unknown_linux_gnu='/usr/lib/aarch64-linux-gnu/pkgconfig'
+COPY install_packages.sh /
+RUN /install_packages.sh arm64
diff --git a/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/armv7-unknown-linux-gnueabihf/Dockerfile
index 287ea4b..93e1552 100644
--- a/docker/armv7-unknown-linux-gnueabihf/Dockerfile
+++ b/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,8 +1,4 @@
-FROM ghcr.io/tesaguri/cross:armv7-unknown-linux-gnueabihf
+FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:latest
 
-RUN dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:armhf libssl-dev:armhf
-
-ENV PKG_CONFIG_ALLOW_CROSS_armv7_unknown_linux_gnueabihf=1 \
-    PKG_CONFIG_PATH_armv7_unknown_linux_gnueabihf='/usr/lib/arm-linux-gnueabihf/pkgconfig'
+COPY install_packages.sh /
+RUN /install_packages.sh armhf
diff --git a/docker/install_packages.sh b/docker/install_packages.sh
new file mode 100755
index 0000000..10b4a7c
--- /dev/null
+++ b/docker/install_packages.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -xeo pipefail
+
+dpkg --add-architecture "$1"
+
+apt-get update
+apt-get install --assume-yes --no-install-recommends libsqlite3-dev libsqlite3-dev:"$1"
+
+if [ "$(lsb_release -rs)" \< '22.04' ]; then
+	# Use `libssl3` package from Ubuntu 22.04 (jammy) since 20.04 (focal) doesn't have the package.
+	apt-get install --assume-yes --no-install-recommends debconf:"$1" libc6:"$1"
+	curl -fSs \
+		-O http://ports.ubuntu.com/pool/main/o/openssl/libssl3_3.0.2-0ubuntu1_arm64.deb \
+		-O http://ports.ubuntu.com/pool/main/o/openssl/libssl-dev_3.0.2-0ubuntu1_arm64.deb
+	sha1sum --check <<< '2a5dedaa3ddfd4d0c881b9f751dd5d4cc7870064 libssl3_3.0.2-0ubuntu1_arm64.deb'
+	sha1sum --check <<< '2a5dedaa3ddfd4d0c881b9f751dd5d4cc7870064 libssl-dev_3.0.2-0ubuntu1_arm64.deb'
+	dpkg -i libssl3_3.0.2-0ubuntu1_arm64.deb libssl-dev_3.0.2-0ubuntu1_arm64.deb
+else
+	apt-get install --assume-yes --no-install--recommends libssl3:"$1" libssl-dev:"$1"
+fi