Skip to content

Commit d1e532f

Browse files
committed
fix: address PR review feedback
- Switch all branch references from `master` to `main` to match the repo's actual default branch (ci.yaml, release.yaml, .releaserc.yaml, README.md). Without this, CI won't trigger on PRs and releases won't run on merge. - Replace nondeterministic `docker load | docker tag $(head -1)` with `skopeo copy oci-archive:... docker-daemon:...` for a deterministic image load into the Docker daemon. - Combine the first three apt-get RUN layers (system upgrade, deadsnakes Python, skopeo/buildah) into a single layer to reduce image size and redundant apt-get update calls. - Fix README: pin RUNNER_VERSION=2.321.0 in the example manifest (was `latest`), replace update-tools workflow reference with Renovate, update project structure tree. https://claude.ai/code/session_01RofXXAMZxK4irobNYjYn3W
1 parent ba84de9 commit d1e532f

File tree

5 files changed

+17
-30
lines changed

5 files changed

+17
-30
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches: [main]
66

77
permissions:
88
contents: read

.github/workflows/release.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66

77
permissions:
88
contents: write
@@ -95,8 +95,7 @@ jobs:
9595
buildah push "${IMAGE_NAME}:${IMAGE_VERSION}" "oci-archive:build/${IMAGE_NAME}.tar"
9696
9797
# Load into Docker daemon for dive scan
98-
docker load -i "build/${IMAGE_NAME}.tar"
99-
docker tag "$(docker images -q | head -1)" "${IMAGE_NAME}:${IMAGE_VERSION}"
98+
skopeo copy "oci-archive:build/${IMAGE_NAME}.tar" "docker-daemon:${IMAGE_NAME}:${IMAGE_VERSION}"
10099
101100
- name: Dive filesystem scan
102101
env:

.releaserc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
branches:
2-
- master
2+
- main
33

44
plugins:
55
- "@semantic-release/commit-analyzer"

Containerfile

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,17 @@ ARG APP_HOME=/home/runner
66

77
USER root
88

9-
# Update and upgrade the system
10-
RUN apt-get update \
11-
&& apt-get upgrade -y \
12-
&& apt-get clean \
13-
&& rm -rf /var/lib/apt/lists/* \
14-
&& apt-get autoremove -y \
15-
&& apt-get autoclean -y
16-
17-
# Add Python 3.12, 3.13 and 3.14
18-
# Add deadsnake apt repository
9+
# System upgrade, Python 3.12/3.13/3.14 (deadsnakes), skopeo, buildah
1910
# hadolint ignore=DL3008
2011
RUN apt-get update \
12+
&& apt-get upgrade -y \
2113
&& apt-get install --no-install-recommends -y gnupg ca-certificates software-properties-common curl \
2214
&& DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa \
2315
&& apt-get update \
24-
&& apt-get install --no-install-recommends -y python3.12 python3.13 python3.14 \
25-
&& apt-get clean \
26-
&& rm -rf /var/lib/apt/lists/*
27-
28-
# Install skopeo and buildah
29-
# hadolint ignore=DL3008
30-
RUN apt-get update \
31-
&& apt-get install --no-install-recommends -y skopeo buildah \
16+
&& apt-get install --no-install-recommends -y \
17+
python3.12 python3.13 python3.14 \
18+
skopeo buildah \
19+
&& apt-get autoremove -y \
3220
&& apt-get clean \
3321
&& rm -rf /var/lib/apt/lists/*
3422

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ These tools allow the image to run its own build pipeline as a self-hosted runne
4444

4545
| Workflow | Trigger | Description |
4646
|----------|---------|-------------|
47-
| **CI** | Pull request to `master` | Commitlint, hadolint lint, test build |
48-
| **Release** | Push to `master` | Semantic release, build, scan, push to GHCR |
49-
| **Update tools** | Weekly (Monday 08:00 UTC) / manual | Checks for new tool versions, opens a PR |
47+
| **CI** | Pull request to `main` | Commitlint, hadolint lint, test build |
48+
| **Release** | Push to `main` | Semantic release, build, scan, push to GHCR |
49+
| **Renovate** | Automated | Keeps tool versions and dependencies up to date via PRs |
5050

5151
### Release process
5252

53-
Releases are fully automated via [semantic-release](https://github.com/semantic-release/semantic-release). Pushing to `master` triggers version analysis based on [Conventional Commits](https://www.conventionalcommits.org/):
53+
Releases are fully automated via [semantic-release](https://github.com/semantic-release/semantic-release). Pushing to `main` triggers version analysis based on [Conventional Commits](https://www.conventionalcommits.org/). Tool versions are kept up to date automatically by [Renovate](https://docs.renovatebot.com/).
5454

5555
| Commit prefix | Version bump |
5656
|---------------|-------------|
@@ -99,7 +99,7 @@ registry: ghcr.io/deerhide/python-github-runner
9999
build:
100100
format: oci
101101
args:
102-
- RUNNER_VERSION=latest
102+
- RUNNER_VERSION=2.321.0
103103
- ARGO_VERSION=3.6.4
104104
- KARGO_VERSION=1.9.2
105105
- PACK_VERSION=0.36.4
@@ -186,8 +186,8 @@ git commit -m "WIP"
186186
├── .github/
187187
│ └── workflows/
188188
│ ├── ci.yaml # PR validation
189-
── release.yaml # Semantic release + build + push
190-
└── update-tools.yaml # Automated tool version updates
189+
── release.yaml # Semantic release + build + push
190+
├── renovate.json # Renovate dependency update config
191191
└── scripts/
192192
├── builder.sh # Local build orchestration
193193
├── install_tools.sh # Build tool installer

0 commit comments

Comments
 (0)