Last try

moves-rwth · Aug 22, 2024 · 8c3237e · 8c3237e
1 parent 898e86a
commit 8c3237e
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/.github/workflows/basesystem.yml b/.github/workflows/basesystem.yml
@@ -7,20 +7,23 @@ on:
  # needed to trigger the workflow manually
  workflow_dispatch:
 
+env:
+ IMAGE: mvolk/storm-basesystem
+
 jobs:
  build:
- name: Build for ${{ matrix.image.name }} on ${{ matrix.platform }}
+ name: Build ${{ matrix.image.name }} on ${{ matrix.platform }}
  runs-on: ubuntu-latest
  strategy:
  matrix:
  image:
- - {name: "ubuntu-20.04", baseImg: "ubuntu:20.04", file: "Dockerfile"}
- - {name: "debian-11", baseImg: "debian:11", file: "Dockerfile"}
- - {name: "ubuntu-22.04", baseImg: "ubuntu:22.04", file: "Dockerfile"}
- - {name: "debian-12", baseImg: "debian:12", file: "Dockerfile"}
- - {name: "ubuntu-24.04", baseImg: "ubuntu:24.04", file: "Dockerfile"}
- - {name: "latest", baseImg: "ubuntu:rolling", file: "Dockerfile"}
- - {name: "minimal_dependencies", baseImg: "ubuntu:rolling", file: "Dockerfile.minimal_dependencies"}
+ - {name: "ubuntu-20.04", baseImg: "ubuntu:20.04", file: "storm-basesystem/Dockerfile"}
+ - {name: "debian-11", baseImg: "debian:11", file: "storm-basesystem/Dockerfile"}
+ - {name: "ubuntu-22.04", baseImg: "ubuntu:22.04", file: "storm-basesystem/Dockerfile"}
+ - {name: "debian-12", baseImg: "debian:12", file: "storm-basesystem/Dockerfile"}
+ - {name: "ubuntu-24.04", baseImg: "ubuntu:24.04", file: "storm-basesystem/Dockerfile"}
+ - {name: "latest", baseImg: "ubuntu:rolling", file: "storm-basesystem/Dockerfile"}
+ - {name: "minimal_dependencies", baseImg: "ubuntu:rolling", file: "storm-basesystem/Dockerfile.minimal_dependencies"}
  platform:
  - linux/amd64
  - linux/arm64
@@ -29,12 +32,12 @@ jobs:
  # Sanitize platform name
  run: |
  platform=${{ matrix.platform }}
- echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
- - name: Docker meta
+ echo "PLATFORM=${platform//\//-}" >> $GITHUB_ENV
+ - name: Docker metadata
  id: meta
  uses: docker/metadata-action@v5
  with:
- images: mvolk/storm-basesystem
+ images: ${{ env.IMAGE }}
  tags: |
  type=raw,${{ matrix.image.name }}
  - name: Set up QEMU
@@ -52,11 +55,12 @@ jobs:
  id: build
  uses: docker/build-push-action@v6
  with:
- file: storm-basesystem/${{ matrix.image.file }}
- build-args: LINUX_BASE=${{ matrix.image.baseImg }}
+ file: ${{ matrix.image.file }}
+ build-args: |
+ LINUX_BASE=${{ matrix.image.baseImg }}
  platforms: ${{ matrix.platform }}
  labels: ${{ steps.meta.outputs.labels }}
- outputs: type=image,name=mvolk/storm-basesystem,push-by-digest=true,name-canonical=true,push=true
+ outputs: type=image,name=${{ env.IMAGE }},push-by-digest=true,name-canonical=true,push=true
  - name: Export digest
  run: |
  mkdir -p /tmp/digests/${{ matrix.image.name }}
@@ -65,30 +69,28 @@ jobs:
  - name: Upload digest
  uses: actions/upload-artifact@v4
  with:
- name: ${{ matrix.image.name }}-digests-${{ env.PLATFORM_PAIR }}
+ name: ${{ matrix.image.name }}-digests-${{ env.PLATFORM }}
  path: /tmp/digests/${{ matrix.image.name }}/*
  if-no-files-found: error
  retention-days: 1
 
  merge:
- name: Merge Docker manifests for ${{ matrix.image.name }}
+ name: Merge manifests for ${{ matrix.image.name }}
  runs-on: ubuntu-latest
  needs:
  - build
  strategy:
  matrix:
  image:
- # Must be the same as before
+ # Must be the same as above
  - {name: "ubuntu-20.04"}
  - {name: "debian-11"}
  - {name: "ubuntu-22.04"}
  - {name: "debian-12"}
  - {name: "ubuntu-24.04"}
  - {name: "latest"}
+ - {name: "minimal_dependencies"}
  steps:
- - name: Prepare
- run: |
- echo "IMAGE=mvolk/storm-basesystem:${{ matrix.image.name }}" >> $GITHUB_ENV
  - name: Download digests
  uses: actions/download-artifact@v4
  with:
@@ -97,11 +99,11 @@ jobs:
  merge-multiple: true
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v3
- - name: Docker meta
+ - name: Docker metadata
  id: meta
  uses: docker/metadata-action@v5
  with:
- images: mvolk/storm-basesystem
+ images: ${{ env.IMAGE }}
  tags: |
  type=raw,${{ matrix.image.name }}
  - name: Login to Docker Hub
@@ -115,7 +117,7 @@ jobs:
  working-directory: /tmp/digests/${{ matrix.image.name }}
  run: |
  docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< '${{ steps.meta.outputs.json}}') \
- $(printf 'mvolk/storm-basesystem@sha256:%s ' *)
+ $(printf '${{ env.IMAGE }}@sha256:%s ' *)
  - name: Inspect image
  run: |
- docker buildx imagetools inspect mvolk/storm-basesystem:${{ steps.meta.outputs.version }}
+ docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }}