From 02977bdc95da3c1cd166b9768726216fbcc0f7c2 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 2 Apr 2024 11:56:11 +0800 Subject: [PATCH] fix: copy full images --- .gitea/workflows/release.yaml | 46 ++++++------------------------ README.md | 1 + dockerfiles/ubuntu-full.dockerfile | 19 ------------ 3 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 dockerfiles/ubuntu-full.dockerfile diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 5470faf..ed22399 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -117,41 +117,13 @@ jobs: gitea/runner-images:ubuntu-slim-20.04 gitea/runner-images:ubuntu-slim-20.04-${{ steps.meta.outputs.IMAGE_VERSION }} - - name: Build and push full 22.04 - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/ubuntu.dockerfile - platforms: | - linux/amd64 - pull: true - push: true - no-cache: true - build-args: | - BASE_IMAGE_TAG=full-22.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-22.04-full - gitea/runner-images:ubuntu-22.04-full-${{ steps.meta.outputs.IMAGE_VERSION }} - gitea/runner-images:ubuntu-latest-full + - name: Copy full 22.04 + run: | + skopeo copy -a docker://ghcr.io/catthehacker/ubuntu:ubuntu-22.04-full docker://gitea/runner-images:ubuntu-22.04-full + skopeo copy -a docker://ghcr.io/catthehacker/ubuntu:ubuntu-22.04-full docker://gitea/runner-images:ubuntu-22.04-full-${{ steps.meta.outputs.IMAGE_VERSION }} + skopeo copy -a docker://ghcr.io/catthehacker/ubuntu:ubuntu-22.04-full docker://gitea/runner-images:ubuntu-latest-full - - name: Build and push full 20.04 - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/ubuntu.dockerfile - platforms: | - linux/amd64 - pull: true - push: true - no-cache: true - build-args: | - BASE_IMAGE_TAG=full-20.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-20.04-full - gitea/runner-images:ubuntu-20.04-${{ steps.meta.outputs.IMAGE_VERSION }} + - name: Copy full 20.04 + run: | + skopeo copy -a docker://ghcr.io/catthehacker/ubuntu:ubuntu-20.04-full docker://gitea/runner-images:ubuntu-22.04-full + skopeo copy -a docker://ghcr.io/catthehacker/ubuntu:ubuntu-20.04-full docker://gitea/runner-images:ubuntu-22.04-full-${{ steps.meta.outputs.IMAGE_VERSION }} diff --git a/README.md b/README.md index e9adea0..8ad71dd 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Their size is much smaller, which is friendly to disk-space constrained runners. Full images are based on `catthehacker/ubuntu:full-*`, which contains all tools provided by GitHub Actions runners. They have huge sizes, but are useful if you need to run workflows in a GitHub Actions compatible environment. +Please note that full images support amd64 architecture only. | Tag | Base | Size | Version | |------------------------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------| diff --git a/dockerfiles/ubuntu-full.dockerfile b/dockerfiles/ubuntu-full.dockerfile deleted file mode 100644 index 27951c1..0000000 --- a/dockerfiles/ubuntu-full.dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -ARG BASE_IMAGE_TAG - -FROM ghcr.io/catthehacker/ubuntu:${BASE_IMAGE_TAG} - -ARG IMAGE_CREATED -ARG IMAGE_VERSION -ARG IMAGE_REVISION - -LABEL org.opencontainers.image.created="${IMAGE_CREATED}" \ - org.opencontainers.image.authors="Gitea" \ - org.opencontainers.image.url="https://gitea.com/gitea/runner-images" \ - org.opencontainers.image.documentation="https://gitea.com/gitea/runner-images/src/branch/main/README.md" \ - org.opencontainers.image.source="https://gitea.com/gitea/runner-images" \ - org.opencontainers.image.version="${IMAGE_VERSION}" \ - org.opencontainers.image.revision="${IMAGE_REVISION}" \ - org.opencontainers.image.vendor="Gitea" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.title="Official Gitea Actions runner images" \ - org.opencontainers.image.description="Official docker images used by act_runner to run workflows."