ci: install libc in running container

Author: IgnisDa

.github/workflows/main.yml

@@ -101,9 +101,7 @@ jobs:
       matrix:
         platform:
           - target: x86_64-unknown-linux-gnu
-            command: cargo
           - target: aarch64-unknown-linux-gnu
-            command: cross
     steps:
       - uses: actions/checkout@v4
         with:
@@ -134,7 +132,6 @@ jobs:
           restore-keys: |
             cargo-build-${{ runner.os }}-${{ matrix.platform.target }}-
       - name: Install cross
-        if: ${{ matrix.platform.command == 'cross' }}
         uses: taiki-e/cache-cargo-install-action@caa6f48d18d42462f9c30df89e2b4f71a42b7c2c
         with:
           tool: cross
@@ -149,7 +146,7 @@ jobs:
           DEFAULT_MAL_CLIENT_ID: ${{ secrets.DEFAULT_MAL_CLIENT_ID }}
           DEFAULT_TMDB_ACCESS_TOKEN: ${{ secrets.DEFAULT_TMDB_ACCESS_TOKEN }}
         run: |
-          ${{ matrix.platform.command }} build --locked --target ${{ matrix.platform.target }} --release
+          cross build --locked --target ${{ matrix.platform.target }} --release
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
@@ -202,6 +199,7 @@ jobs:
             type=semver,pattern=v{{major}}.{{minor}},enable=${{ needs.pre-workflow-checks.outputs.should-release == 'true' }}
             type=semver,pattern=v{{major}},enable=${{ needs.pre-workflow-checks.outputs.should-release == 'true' }}
             type=raw,value=latest,enable=${{ needs.pre-workflow-checks.outputs.should-release == 'true' }}
+            type=sha
       - name: Build and push
         uses: docker/build-push-action@v5
         with:

Dockerfile

@@ -34,10 +34,12 @@ LABEL org.opencontainers.image.description="The only self hosted tracker you wil
 ENV FRONTEND_UMAMI_SCRIPT_URL="https://umami.diptesh.me/script.js"
 ENV FRONTEND_UMAMI_WEBSITE_ID="5ecd6915-d542-4fda-aa5f-70f09f04e2e0"
 COPY --from=caddy:2.7.5 /usr/bin/caddy /usr/local/bin/caddy
-RUN apt-get update && apt-get install -y --no-install-recommends wget curl libssl3 ca-certificates procps && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends wget curl libssl3 ca-certificates procps libc6 && rm -rf /var/lib/apt/lists/*
 RUN npm install --global [email protected] && concurrently --version
 RUN useradd -m -u 1001 ryot
-RUN if [ "${TARGETARCH}" = "arm64" ]; then apt-get update && apt-get install -y --no-install-recommends wget && wget http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_arm64.deb && dpkg -i libssl1.1_1.1.1w-0+deb11u1_arm64.deb && rm -rf libssl1.1_1.1.1w-0+deb11u1_arm64.deb && apt-get remove -y wget && rm -rf  rm -rf /var/lib/apt/lists/*; fi
+RUN if [ "${TARGETARCH}" = "amd64" ]; then apt-get update && apt-get install -y --no-install-recommends libssl-dev; fi
+RUN if [ "${TARGETARCH}" = "arm64" ]; then wget http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_arm64.deb && dpkg -i libssl1.1_1.1.1w-0+deb11u1_arm64.deb && rm -rf libssl1.1_1.1.1w-0+deb11u1_arm64.deb; fi
+RUN rm -rf /var/lib/apt/lists/*
 WORKDIR /home/ryot
 USER ryot
 COPY ci/Caddyfile /etc/caddy/Caddyfile

ci/cross-pre-build.sh

@@ -4,6 +4,10 @@ set -euxo pipefail
 apt-get update
 apt-get --assume-yes install patch
 
+if [[ $CROSS_TARGET == "x86_64-unknown-linux-gnu" ]]; then
+  apt-get update && apt-get --assume-yes install libssl-dev
+fi
+
 if [[ "$CROSS_TARGET" == "aarch64-unknown-linux-gnu" ]]; then
   dpkg --add-architecture $CROSS_DEB_ARCH
   apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH