diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01af003..11ab857 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ on: jobs: supported-platform-matrix: name: Supported processor platforms - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: platform: ${{ steps.supported-platform-matrix.outputs.platform }} steps: @@ -17,7 +17,7 @@ jobs: uses: WyriHaximus/github-action-oci-image-supported-platforms@main lint-dockerfile: name: Lint Dockerfile - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Lint Dockerfile @@ -34,7 +34,7 @@ jobs: needs: - supported-platform-matrix - lint-dockerfile - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Prepare run: | @@ -66,7 +66,7 @@ jobs: needs: - supported-platform-matrix - build-docker-image - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Prepare run: | @@ -89,7 +89,7 @@ jobs: fail-fast: false matrix: platform: ${{ fromJson(needs.supported-platform-matrix.outputs.platform) }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Prepare run: | @@ -104,7 +104,10 @@ jobs: path: /tmp/docker-image - run: docker load --input /tmp/docker-image/docker_image-${{ env.PLATFORM_PAIR }}.tar - run: docker image ls -a - - run: ./tests.sh "${DOCKER_IMAGE}:${{ env.PLATFORM_PAIR }}" + - uses: WyriHaximus/github-action-testinfra@main + with: + image: ${{ env.DOCKER_IMAGE }}:${{ env.PLATFORM_PAIR }} + flags: --platform="${{ matrix.platform }}" push-image: if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' name: Push @@ -112,7 +115,7 @@ jobs: - supported-platform-matrix - scan-vulnerability - tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: registry: image: registry:2 diff --git a/Dockerfile b/Dockerfile index 7477205..7340810 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ USER root # hadolint ignore=DL3008,DL3047,DL3009,DL4006,DL3015,DL4001 RUN (echo 'DPkg::Post-Invoke {"/bin/rm -f /var/cache/apt/archives/*.deb || true";};' | tee /etc/apt/apt.conf.d/clean) &&\ - apt-get update &&\ - apt-get upgrade -y &&\ +# apt-get update &&\ +# apt-get upgrade -y &&\ apt-get install -y curl wget make git unzip gnupg software-properties-common jq &&\ ## TerraForm (wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null) &&\