Skip to content

Commit d6a51e8

Browse files
committed
fix(ci): preserve required checks for base updates
Keep the protected branch's existing check contexts running against the known-good Fedora 44 digest. The base-image workflow overrides that default with its explicit candidate image and validates the full pipeline before publishing.
1 parent d202ccb commit d6a51e8

4 files changed

Lines changed: 6 additions & 9 deletions

File tree

.devcontainer/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DEVCONTAINER_BASE_TAG=latest
1+
ARG DEVCONTAINER_BASE_IMAGE=ghcr.io/marinatedconcrete/devcontainer-base:latest@sha256:9653d9dc6d4e11e803442622dcf3bd8f11b872553547b5546d517b370dfc6301
22

33
FROM ghcr.io/hadolint/hadolint:v2.14.0@sha256:27086352fd5e1907ea2b934eb1023f217c5ae087992eb59fde121dce9c9ff21e AS hadolint
44
FROM registry.k8s.io/kustomize/kustomize:v5.8.1@sha256:899fcd3bc898160e62bcaf82932b0cb29ba38d16272353db2e7acbba82129429 AS kustomize
@@ -8,7 +8,7 @@ COPY .devcontainer/build_files /
88
COPY ansible/requirements.txt /requirements.txt
99

1010
# hadolint ignore=DL3007
11-
FROM ghcr.io/marinatedconcrete/devcontainer-base:${DEVCONTAINER_BASE_TAG}
11+
FROM ${DEVCONTAINER_BASE_IMAGE}
1212

1313
USER root
1414

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "config",
33
"build": {
44
"args": {
5-
"DEVCONTAINER_BASE_TAG": "${localEnv:DEVCONTAINER_BASE_TAG:latest}"
5+
"DEVCONTAINER_BASE_IMAGE": "${localEnv:DEVCONTAINER_BASE_IMAGE:ghcr.io/marinatedconcrete/devcontainer-base:latest@sha256:9653d9dc6d4e11e803442622dcf3bd8f11b872553547b5546d517b370dfc6301}"
66
},
77
"cacheFrom": "ghcr.io/marinatedconcrete/config-devcontainer",
88
"context": "..",

.github/workflows/checks.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
name: Run checks
33
on:
44
push:
5-
paths-ignore:
6-
- .github/workflows/image-devcontainer-base.yml
7-
- images/devcontainer-base/**
85

96
jobs:
107
build:

.github/workflows/image-devcontainer-base.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
contents: read
2929
packages: write
3030
env:
31-
DEVCONTAINER_BASE_TAG: candidate-${{ github.sha }}
31+
DEVCONTAINER_BASE_IMAGE: ghcr.io/${{ github.repository_owner }}/devcontainer-base:candidate-${{ github.sha }}
3232

3333
steps:
3434
- name: Checkout Repo
@@ -46,7 +46,7 @@ jobs:
4646
file: images/devcontainer-base/Containerfile
4747
load: true
4848
push: false
49-
tags: ghcr.io/${{ github.repository_owner }}/devcontainer-base:${{ env.DEVCONTAINER_BASE_TAG }}
49+
tags: ${{ env.DEVCONTAINER_BASE_IMAGE }}
5050
- name: Validate Full CI Pipeline
5151
uses: devcontainers/ci@513af61f4de4f75d37e4438f184ba4358f0fc1ca # v0.3.1900000450
5252
with:
@@ -60,6 +60,6 @@ jobs:
6060
if: github.event_name != 'pull_request'
6161
run: |
6262
docker tag \
63-
"ghcr.io/${{ github.repository_owner }}/devcontainer-base:${DEVCONTAINER_BASE_TAG}" \
63+
"${DEVCONTAINER_BASE_IMAGE}" \
6464
ghcr.io/${{ github.repository_owner }}/devcontainer-base:latest
6565
docker push ghcr.io/${{ github.repository_owner }}/devcontainer-base:latest

0 commit comments

Comments
 (0)