From 0015ccd2953a8d865892a54a481da313e7341803 Mon Sep 17 00:00:00 2001 From: Niek van der Maas Date: Wed, 21 Jul 2021 07:26:28 +0000 Subject: [PATCH] Add Debian sid --- .github/workflows/base.yml | 9 ++++++--- .github/workflows/deploy.yml | 9 ++++++--- .github/workflows/release.yml | 9 ++++++--- README.md | 1 + 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 651c376e..a201cc5b 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -60,8 +60,11 @@ jobs: timeout_minutes: 120 command: docker buildx build -f Dockerfile.base.ubuntu-bionic -t ${ORG}/github-runner-base:ubuntu-bionic --output "type=image,push=true" --platform linux/amd64,linux/arm/v7,linux/arm64 . - debian_base_buster_deploy: + debian_base_deploy: runs-on: ubuntu-latest + strategy: + matrix: + release: [buster, sid] steps: - name: Copy Repo Files uses: actions/checkout@master @@ -75,7 +78,7 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Copy Dockerfile - run: cp Dockerfile.base Dockerfile.base.debian-buster; sed -i.bak 's/FROM.*/FROM debian:buster/' Dockerfile.base.debian-buster + run: cp Dockerfile.base Dockerfile.base.debian-${{ matrix.release }}; sed -i.bak 's/FROM.*/FROM debian:${{ matrix.release }}/' Dockerfile.base.debian-${{ matrix.release }} - name: Login run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }} - name: Build @@ -84,4 +87,4 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 120 - command: docker buildx build -f Dockerfile.base.debian-buster -t ${ORG}/github-runner-base:debian-buster --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . + command: docker buildx build -f Dockerfile.base.debian-${{ matrix.release }} -t ${ORG}/github-runner-base:debian-${{ matrix.release }} --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ca9edbbf..0a4bd7db 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -60,8 +60,11 @@ jobs: timeout_minutes: 120 command: docker buildx build -f Dockerfile.ubuntu-bionic -t ${ORG}/github-runner:ubuntu-bionic --output "type=image,push=true" --platform linux/amd64,linux/arm/v7,linux/arm64 . - debian_buster_deploy: + debian_deploy: runs-on: ubuntu-latest + strategy: + matrix: + release: [buster, sid] steps: - name: Copy Repo Files uses: actions/checkout@master @@ -75,7 +78,7 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Copy Dockerfile - run: cp Dockerfile Dockerfile.debian-buster; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:debian-buster/" Dockerfile.debian-buster + run: cp Dockerfile Dockerfile.debian-${{ matrix.release }}; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:debian-${{ matrix.release }}/" Dockerfile.debian-${{ matrix.release }} - name: Login run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }} - name: Build @@ -84,4 +87,4 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 120 - command: docker buildx build -f Dockerfile.debian-buster -t ${ORG}/github-runner:debian-buster --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . + command: docker buildx build -f Dockerfile.debian-${{ matrix.release }} -t ${ORG}/github-runner:debian-${{ matrix.release }} --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50d557d9..b1d6c8ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,8 +76,11 @@ jobs: timeout_minutes: 120 command: docker buildx build -f Dockerfile.ubuntu-bionic -t ${ORG}/github-runner:${TAG}-ubuntu-bionic --output "type=image,push=true" --platform linux/amd64,linux/arm/v7,linux/arm64 . - debian-buster_tag: + debian_tag: runs-on: ubuntu-latest + strategy: + matrix: + release: [buster, sid] needs: create-release steps: - name: Copy Repo Files @@ -94,7 +97,7 @@ jobs: - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Copy Dockerfile - run: cp Dockerfile Dockerfile.debian-buster; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:debian-buster/" Dockerfile.debian-buster + run: cp Dockerfile Dockerfile.debian-${{ matrix.release }}; sed -i.bak "s/FROM.*/FROM ${ORG}\/github-runner-base:debian-${{ matrix.release }}/" Dockerfile.debian-${{ matrix.release }} - name: Login run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }} - name: Build @@ -103,4 +106,4 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 120 - command: docker buildx build -f Dockerfile.debian-buster -t ${ORG}/github-runner:${TAG}-debian-buster --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . + command: docker buildx build -f Dockerfile.debian-${{ matrix.release }} -t ${ORG}/github-runner:${TAG}-debian-${{ matrix.release }} --output "type=image,push=true" --platform linux/amd64,linux/arm64,linux/arm/v7 . diff --git a/README.md b/README.md index 735a5cfe..f1ff6d5b 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ A workaround exists, please see [here](https://github.com/myoung34/docker-github | ubuntu focal | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+/` | [latest](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=latest) | This is the latest build (Rebuilt nightly and on master merges). Tags without an OS name are included. | Tags without an OS name *before* 9/17/2020 are `eoan`. `armv7` support stopped 9/18/2020 due to inconsistent docker-ce packaging | | ubuntu bionic | `x86_64`,`armv7`,`arm64` | `/\d\.\d{3}\.\d+-ubuntu-bionic/` | [ubuntu-bionic](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=ubuntu-bionic) | This is the latest build from bionic (Rebuilt nightly and on master merges). Tags with `-ubuntu-bionic` are included and created on [upstream tags](https://github.com/actions/runner/tags). | | | debian buster | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-buster/` | [debian-buster](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-buster) | This is the latest build from buster (Rebuilt nightly and on master merges). Tags with `-debian-buster` are included and created on [upstream tags](https://github.com/actions/runner/tags). | | +| debian sid | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-sid/` | [debian-sid](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-sid) | This is the latest build from sid (Rebuilt nightly and on master merges). Tags with `-debian-sid` are included and created on [upstream tags](https://github.com/actions/runner/tags). | | | ubuntu xenial | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-ubuntu-xenial/` | [ubuntu-xenial](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=ubuntu-xenial) | This is the latest build from xenial (Rebuilt nightly and on master merges). Tags with `-ubuntu-xenial` are included and created on [upstream tags](https://github.com/actions/runner/tags). | This is deprecated as of 7/15/2021 and will no longer receive tags. | These containers are built via Github actions that [copy the dockerfile](https://github.com/myoung34/docker-github-actions-runner/blob/master/.github/workflows/deploy.yml#L47), changing the `FROM` and building to provide simplicity.