Skip to content

fix(ci): build Docker images on PRs, push only on main #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KaelSensei merged 1 commit into from
Mar 24, 2026
Merged

fix(ci): build Docker images on PRs, push only on main #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-analyzer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-test
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -64,6 +63,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -81,7 +81,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: services/analyzer
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-test
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -57,6 +56,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -74,7 +74,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: services/api
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-collector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-test
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -64,6 +63,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -81,7 +81,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: services/collector
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-dashboard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-build
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -51,6 +50,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -68,7 +68,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: dashboard
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-notifier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-test
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -60,6 +59,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -77,7 +77,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: services/notifier
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-subscription.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
name: Build & Push Docker
runs-on: ubuntu-latest
needs: lint-and-test
if: github.ref == 'refs/heads/main'
permissions:
contents: read
packages: write
Expand All @@ -62,6 +61,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -79,7 +79,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: services/subscription
push: true
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ Versions map to GitHub pull requests; the project does not use semver tags yet.

---

## [0.9.0] - 2026-03-24 - PR #10: Docker build validation on every PR

### Fixed

- All six `build-and-push` CI jobs were gated with
`if: github.ref == 'refs/heads/main'`, meaning a broken Dockerfile was only
discovered after merge. The job now runs on every push and PR; only the push
to GHCR remains conditional on `main`. The GHCR login step is also skipped
on PRs so no credentials are required for a build-only run.

---

## [0.8.0] - 2026-03-23 - PR #8: Fix collector and analyzer Docker builds

### Fixed
Expand Down
7 changes: 3 additions & 4 deletions PROGRESS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ Kong proxies the public API. OTel Collector forwards traces to Jaeger.
| CI - e2e | passing | push/PR on `e2e/**` |
| PR Checks | passing | all PRs (commitlint + markdownlint) |

**Known gap:** Docker `build-and-push` only runs on `main`, not on PRs.
A failing Dockerfile is only caught after merge. Fix planned: build (no push)
on PRs too.
Docker `build-and-push` now runs on every PR (build only) and pushes to GHCR
only on `main`. A broken Dockerfile will fail the PR before merge.

---

Expand All @@ -90,7 +89,7 @@ Items not yet started, ordered roughly by priority.

### Near-term

- [ ] Build (no push) Docker images on PRs so broken Dockerfiles are caught
- [x] Build (no push) Docker images on PRs so broken Dockerfiles are caught
before merge.
- [ ] Replace the `go get` workaround in Dockerfiles with properly committed
`go.mod` / `go.sum` files (requires Go installed in the dev environment
Expand Down
Loading