Skip to content

Commit a23aaab

Browse files
committed
Remove focal suppor
1 parent 1b87a30 commit a23aaab

9 files changed

Lines changed: 5 additions & 211 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
github-runner-version:
7-
description: 'Version on github runner(in https://github.com/actions/runner), e.g: 2.322.0'
7+
description: 'Version on github runner(in https://github.com/actions/runner), e.g: 2.328.0'
88
required: true
9-
default: '2.322.0'
9+
default: '2.328.0'
1010

1111
jobs:
1212
build-images:
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: true
1616
matrix:
1717
platform: [amd64, arm64]
18-
code_name: [focal, jammy, noble]
18+
code_name: [jammy, noble]
1919

2020
steps:
2121
- uses: actions/checkout@v4
@@ -94,14 +94,11 @@ jobs:
9494
9595
- name: Combine two images on GHCR and sync to DockerHub
9696
run: |
97-
docker manifest create ghcr.io/${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }} --amend ghcr.io/${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }}-amd64 --amend ghcr.io/${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }}-arm64
98-
docker manifest push ghcr.io/${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }}
9997
docker manifest create ghcr.io/${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }} --amend ghcr.io/${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }}-amd64 --amend ghcr.io/${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }}-arm64
10098
docker manifest push ghcr.io/${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }}
10199
docker manifest create ghcr.io/${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }} --amend ghcr.io/${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }}-amd64 --amend ghcr.io/${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }}-arm64
102100
docker manifest push ghcr.io/${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }}
103101
104-
./regctl-linux-amd64 image copy ghcr.io/${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }} ${{ github.repository }}:focal-${{ github.event.inputs.github-runner-version }} -v info
105102
./regctl-linux-amd64 image copy ghcr.io/${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }} ${{ github.repository }}:jammy-${{ github.event.inputs.github-runner-version }} -v info
106103
./regctl-linux-amd64 image copy ghcr.io/${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }} ${{ github.repository }}:noble-${{ github.event.inputs.github-runner-version }} -v info
107104

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ No Operator, No CRD, No need to blindly apply a `yml` to K8s cluster, only a sim
66

77
This repo provides the following images, both are Multi-Arch(amd64/arm64 supported):
88

9-
- `knatnetwork/github-runner:focal-<tag>`
10-
- `ghcr.io/knatnetwork/github-runner:focal-<tag>`
119
- `knatnetwork/github-runner:jammy-<tag>`
1210
- `ghcr.io/knatnetwork/github-runner:jammy-<tag>`
1311
- `knatnetwork/github-runner:noble-<tag>`
@@ -18,7 +16,6 @@ This repo provides the following images, both are Multi-Arch(amd64/arm64 support
1816

1917
## Specs
2018

21-
- `github-runner:focal-<tag>` images are based on Ubuntu 20.04
2219
- `github-runner:jammy-<tag>` images are based on Ubuntu 22.04
2320
- `github-runner:noble-<tag>` images are based on Ubuntu 24.04
2421
- `github-runner:latest` images are latest image of `github-runner:noble-<tag>`

focal-amd64/Dockerfile

Lines changed: 0 additions & 43 deletions
This file was deleted.

focal-amd64/entrypoint.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

focal-amd64/runsvc.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

focal-arm64/Dockerfile

Lines changed: 0 additions & 45 deletions
This file was deleted.

focal-arm64/entrypoint.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

focal-arm64/runsvc.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

jammy-arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as env
1+
FROM ubuntu:22.04 as env
22

33
ARG GITHUB_RUNNER_VERSION=2.286.1
44
ARG DEBIAN_FRONTEND=noninteractive
@@ -10,7 +10,7 @@ RUN wget https://github.com/actions/runner/releases/download/v${GITHUB_RUNNER_VE
1010
&& sed -i '3,9d' ./config.sh \
1111
&& sed -i '3,8d' ./run.sh
1212

13-
FROM ubuntu:20.04 as runner
13+
FROM ubuntu:22.04 as runner
1414

1515
ARG DEBIAN_FRONTEND=noninteractive
1616
ENV KMS_SERVER_ADDR ""

0 commit comments

Comments
 (0)