Skip to content

Commit

Permalink
CI: Update Dockerfile to install OpenSSL 3
Browse files Browse the repository at this point in the history
The custom container is no longer required since the upstream image has
removed (the old version of) OpenSSL entirely.
  • Loading branch information
tesaguri committed Jul 24, 2023
1 parent e51ae8a commit b052b1b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 18 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
10 changes: 3 additions & 7 deletions docker/aarch64-unknown-linux-gnu/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
10 changes: 3 additions & 7 deletions docker/armv7-unknown-linux-gnueabihf/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions docker/install_packages.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b052b1b

Please sign in to comment.