Skip to content

Update image refs to use new tagging pattern #351

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update image refs to use new tagging pattern #351

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
7 changes: 5 additions & 2 deletions .github/workflows/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,15 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
name: Register binfmt from multi-platform builds
env:
DOCKER_HUB_PUBLIC_ACCESS_ONLY: true
QUAY_PUBLIC_ACCESS_ONLY: true
Comment on lines +43 to +45
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this is necessary for similar reasons as #283, without those, this step fails with:

Unable to find image 'linuxkit/binfmt:a17941b47f5cb262638cfb49ffc59ac5ac2bf334' locally
docker: error getting credentials - err: exit status 1, out: `ANY_REGISTRY_USERNAME is not set`

(example job)

with:
entrypoint: docker
args: run --privileged linuxkit/binfmt:a17941b47f5cb262638cfb49ffc59ac5ac2bf334
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
name: Run make ${{ matrix.image }}-image
env:
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD_CI }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
name: Run make lint
with:
entrypoint: sh
Expand Down
2 changes: 1 addition & 1 deletion images/bpftool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:1732033829-330cbaf@sha256:5c54f614fb8ee7939492aa4b7d74b37922d98199f5993f6d957a1637ce30eb9e
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04@sha256:278628f08d4979fb9af9ead44277dbc9c92c2465922310916ad0c46ec9999295
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG TESTER_IMAGE=quay.io/cilium/image-tester:1751996942-195b4d9@sha256:a5a3e2d8c597305ff5bb65185898ff52a47a6d53252957852334406830a431a0

FROM ${COMPILERS_IMAGE} AS builder

Expand Down
2 changes: 1 addition & 1 deletion images/compilers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04@sha256:278628f08d4979fb9af9ead44277dbc9c92c2465922310916ad0c46ec9999295
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG TESTER_IMAGE=quay.io/cilium/image-tester:1751996942-195b4d9@sha256:a5a3e2d8c597305ff5bb65185898ff52a47a6d53252957852334406830a431a0

FROM ${UBUNTU_IMAGE} as builder

Expand Down
2 changes: 1 addition & 1 deletion images/llvm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:1732033829-330cbaf@sha256:5c54f614fb8ee7939492aa4b7d74b37922d98199f5993f6d957a1637ce30eb9e
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04@sha256:278628f08d4979fb9af9ead44277dbc9c92c2465922310916ad0c46ec9999295
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG TESTER_IMAGE=quay.io/cilium/image-tester:1751996942-195b4d9@sha256:a5a3e2d8c597305ff5bb65185898ff52a47a6d53252957852334406830a431a0

FROM ${COMPILERS_IMAGE} AS builder

Expand Down
8 changes: 4 additions & 4 deletions images/maker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# syntax=docker/dockerfile:1.17@sha256:38387523653efa0039f8e1c89bb74a30504e76ee9f565e25c9a09841f9427b05

# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

Expand All @@ -14,7 +12,9 @@ FROM ${CRANE_IMAGE} AS crane-dist
FROM ${GOLANG_IMAGE} AS go-builder

# hadolint ignore=SC2215
RUN --mount=type=bind,readwrite,target=/src --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache \
RUN --mount=type=bind,readwrite,target=/src \
--mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/go/pkg/mod \
/src/build-go-deps.sh

FROM ${ALPINE_BASE_IMAGE} AS builder
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN case "${TARGETARCH}" in \
'arm64') export ARCH='arm64' ;; \
esac && \
curl --fail --show-error --silent --location \
https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-${ARCH} \
"https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-${ARCH}" \
--output /out/usr/local/bin/hadolint \
&& chmod +x /out/usr/local/bin/hadolint

Expand Down
4 changes: 2 additions & 2 deletions scripts/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0
Expand All @@ -7,7 +7,7 @@ set -o errexit
set -o pipefail
set -o nounset

MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de}"
MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24}"

with_root_context="${ROOT_CONTEXT:-false}"

Expand Down
4 changes: 2 additions & 2 deletions scripts/get-image-digest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0
Expand All @@ -7,7 +7,7 @@ set -o errexit
set -o pipefail
set -o nounset

MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de}"
MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24}"

if [ "$#" -ne 1 ] ; then
echo "$0 supports exactly 1 argument"
Expand Down
4 changes: 2 additions & 2 deletions scripts/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0
Expand All @@ -7,7 +7,7 @@ set -o errexit
set -o pipefail
set -o nounset

MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de}"
MAKER_IMAGE="${MAKER_IMAGE:-quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24}"

root_dir="$(git rev-parse --show-toplevel)"

Expand Down