diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 6165abc..1aca981 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -37,6 +37,27 @@ jobs: echo IMAGE_VERSION=$(date -u +'v%y.%m.%d') | tee -a $GITHUB_OUTPUT echo IMAGE_REVISION=$(git rev-parse HEAD) | tee -a $GITHUB_OUTPUT + - name: Build and push default 24.04 + uses: docker/build-push-action@v6 + with: + context: . + file: dockerfiles/ubuntu.dockerfile + platforms: | + linux/amd64 + linux/arm64 + pull: true + push: true + no-cache: true + build-args: | + BASE_IMAGE_TAG=act-24.04 + IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }} + IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }} + IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }} + tags: | + gitea/runner-images:ubuntu-24.04 + gitea/runner-images:ubuntu-24.04-${{ steps.meta.outputs.IMAGE_VERSION }} + gitea/runner-images:ubuntu-latest + - name: Build and push default 22.04 uses: docker/build-push-action@v6 with: @@ -56,7 +77,6 @@ jobs: tags: | gitea/runner-images:ubuntu-22.04 gitea/runner-images:ubuntu-22.04-${{ steps.meta.outputs.IMAGE_VERSION }} - gitea/runner-images:ubuntu-latest - name: Build and push default 20.04 uses: docker/build-push-action@v6 @@ -107,6 +127,27 @@ jobs: echo IMAGE_VERSION=$(date -u +'v%y.%m.%d') | tee -a $GITHUB_OUTPUT echo IMAGE_REVISION=$(git rev-parse HEAD) | tee -a $GITHUB_OUTPUT + - name: Build and push slim 24.04 + uses: docker/build-push-action@v6 + with: + context: . + file: dockerfiles/ubuntu-slim.dockerfile + platforms: | + linux/amd64 + linux/arm64 + pull: true + push: true + no-cache: true + build-args: | + BASE_IMAGE_TAG=20-bookworm-slim + IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }} + IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }} + IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }} + tags: | + gitea/runner-images:ubuntu-24.04-slim + gitea/runner-images:ubuntu-24.04-slim-${{ steps.meta.outputs.IMAGE_VERSION }} + gitea/runner-images:ubuntu-latest-slim + - name: Build and push slim 22.04 uses: docker/build-push-action@v6 with: @@ -126,7 +167,6 @@ jobs: tags: | gitea/runner-images:ubuntu-22.04-slim gitea/runner-images:ubuntu-22.04-slim-${{ steps.meta.outputs.IMAGE_VERSION }} - gitea/runner-images:ubuntu-latest-slim - name: Build and push slim 20.04 uses: docker/build-push-action@v6 @@ -168,9 +208,16 @@ jobs: apt-get update apt-get install -y skopeo + - name: Copy full 24.04 + run: | + for dest in ubuntu-24.04-full ubuntu-24.04-full-${{ steps.meta.outputs.IMAGE_VERSION }} ubuntu-latest-full; do + echo "copy catthehacker/ubuntu:full-24.04 -> gitea/runner-images:$dest" + skopeo copy -a --dest-creds ${{ secrets.DOCKER_USERNAME }}:${{ secrets.DOCKER_PASSWORD }} docker://ghcr.io/catthehacker/ubuntu:full-24.04 docker://gitea/runner-images:$dest + done + - name: Copy full 22.04 run: | - for dest in ubuntu-22.04-full ubuntu-22.04-full-${{ steps.meta.outputs.IMAGE_VERSION }} ubuntu-latest-full; do + for dest in ubuntu-22.04-full ubuntu-22.04-full-${{ steps.meta.outputs.IMAGE_VERSION }}; do echo "copy catthehacker/ubuntu:full-22.04 -> gitea/runner-images:$dest" skopeo copy -a --dest-creds ${{ secrets.DOCKER_USERNAME }}:${{ secrets.DOCKER_PASSWORD }} docker://ghcr.io/catthehacker/ubuntu:full-22.04 docker://gitea/runner-images:$dest done