From a516395a8e75ba6b0457eb34aa44ad60dfc17c3a Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Wed, 6 Nov 2024 19:53:09 -0500 Subject: [PATCH 1/4] wip: blank wip: blank --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f28ca05..6b056c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # runner-images -Image factory for Forgejo action runners \ No newline at end of file + +Image factory for Forgejo action runners -- 2.45.2 From 899247e4f6073c3e9edad2446ed210a908315a8c Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Wed, 6 Nov 2024 20:00:03 -0500 Subject: [PATCH 2/4] wip: blank --- .forgejo/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index c6a20e7..286f8f9 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -8,6 +8,11 @@ env: REGISTRY_ENDPOINT: host.containers.internal:5000 jobs: + debug: + runs-on: imagefactory-latest + steps: + - run: git clone https://forge.karnov.club/spadinastan/runner-images.git + - uses: actions/checkout@v4 pre-run: runs-on: imagefactory-latest steps: -- 2.45.2 From b3a4b5034d0b81b5558d8769e8f399fbd24599a6 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Wed, 6 Nov 2024 20:09:05 -0500 Subject: [PATCH 3/4] wip: blank --- .forgejo/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 286f8f9..7376b4f 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -24,9 +24,6 @@ jobs: build-images: needs: [pre-run] runs-on: imagefactory-latest - strategy: - matrix: - image-name: ['debian-12.6-slim'] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -38,18 +35,18 @@ jobs: id: image-metadata run: | echo "image-tag=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "full-image-name=${{ matrix.image-name }}:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + echo "full-image-name=debian-12.6-slim:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Build image - run: python ./build_image.py ${{ steps.image-metadata.outputs.full-image-name }} ./images/${{ matrix.image-name }}/Dockerfile + run: python ./build_image.py ${{ steps.image-metadata.outputs.full-image-name }} ./images/debian-12.6-slim/Dockerfile - name: Tag image as latest - run: podman tag ${{ steps.image-metadata.outputs.full-image-name }} ${{ matrix.image-name }}:latest + run: podman tag ${{ steps.image-metadata.outputs.full-image-name }} debian-12.6-slim:latest - name: List images run: podman image ls - name: Push tagged image to registry if: ${{ github.event_name == "push" }} run: | podman push ${{ steps.image-metadata.outputs.full-image-name }} ${{ env.REGISTRY_ENDPOINT }}/forge-runners/${{ steps.image-metadata.outputs.full-image-name }} - podman push ${{ steps.image-metadata.outputs.full-image-name }} ${{ env.REGISTRY_ENDPOINT }}/forge-runners/${{ matrix.image-name }}:latest + podman push ${{ steps.image-metadata.outputs.full-image-name }} ${{ env.REGISTRY_ENDPOINT }}/forge-runners/debian-12.6-slim:latest post-run: runs-on: imagefactory-latest needs: [build-images] -- 2.45.2 From abfc9aab8403f4b756a3935575e8833824913240 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Wed, 6 Nov 2024 21:00:57 -0500 Subject: [PATCH 4/4] wip: blank --- .forgejo/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 7376b4f..a483286 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: - name: List images run: podman image ls - name: Push tagged image to registry - if: ${{ github.event_name == "push" }} + if: ${{ github.event_name == 'push' }} run: | podman push ${{ steps.image-metadata.outputs.full-image-name }} ${{ env.REGISTRY_ENDPOINT }}/forge-runners/${{ steps.image-metadata.outputs.full-image-name }} podman push ${{ steps.image-metadata.outputs.full-image-name }} ${{ env.REGISTRY_ENDPOINT }}/forge-runners/debian-12.6-slim:latest -- 2.45.2