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..52cb59a 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 rustembedded/cross:aarch64-unknown-linux-gnu -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..413be19 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 rustembedded/cross:armv7-unknown-linux-gnueabihf -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..e9095a4 --- /dev/null +++ b/docker/install_packages.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +set -xeo pipefail + +dpkg --add-architecture "$1" + +if grep -Eq '^UBUNTU_CODENAME=focal$' /etc/os-release; then + # Use `libssl3` package from Ubuntu 22.04 (jammy) since 20.04 (focal) doesn't have the package. + # + echo 'APT::Default-Release "focal";' > /etc/apt/apt.conf.d/01ubuntu + awk '($1$3$4=="debfocalmain"){$3="jammy" ;print}' /etc/apt/sources.list \ + > /etc/apt/sources.list.d/jammy.list + cat <<-EOF > /etc/apt/preferences.d/libssl3 + Package: libssl3 + Pin: release n=jammy + Pin-Priority: 900 + EOF + cat <<-EOF > /etc/apt/preferences.d/libssl-dev + Package: libssl-dev + Pin: release n=jammy + Pin-Priority: 900 + EOF +fi + +apt-get update +apt-get install --assume-yes --no-install-recommends \ + libsqlite3-dev \ + libsqlite3-dev:"$1" \ + libssl3:"$1" \ + libssl-dev:"$1"