Skip to content

Commit a0c5901

Browse files
committed
Update image refs to use new tagging pattern
Signed-off-by: Hadrien Patte <[email protected]>
1 parent 0bf1911 commit a0c5901

File tree

9 files changed

+20
-17
lines changed

9 files changed

+20
-17
lines changed

.github/workflows/images.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,15 @@ jobs:
3838
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
with:
4040
fetch-depth: 0
41-
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
41+
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
4242
name: Register binfmt from multi-platform builds
43+
env:
44+
DOCKER_HUB_PUBLIC_ACCESS_ONLY: true
45+
QUAY_PUBLIC_ACCESS_ONLY: true
4346
with:
4447
entrypoint: docker
4548
args: run --privileged linuxkit/binfmt:a17941b47f5cb262638cfb49ffc59ac5ac2bf334
46-
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
49+
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
4750
name: Run make ${{ matrix.image }}-image
4851
env:
4952
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD_CI }}

.github/workflows/pr-checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14-
- uses: docker://quay.io/cilium/image-maker:e55375ca5ccaea76dc15a0666d4f57ccd9ab89de
14+
- uses: docker://quay.io/cilium/image-maker:1751996942-195b4d9@sha256:9ede3d0c9202b4feaa88c459e57b77bbb5dca422db065a387e58263608491c24
1515
name: Run make lint
1616
with:
1717
entrypoint: sh

images/bpftool/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

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

88
FROM ${COMPILERS_IMAGE} AS builder
99

images/compilers/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

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

77
FROM ${UBUNTU_IMAGE} as builder
88

images/llvm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright 2020 Authors of Cilium
22
# SPDX-License-Identifier: Apache-2.0
33

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

88
FROM --platform=linux/amd64 ${COMPILERS_IMAGE} AS builder
99

images/maker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# syntax=docker/dockerfile:1.17@sha256:38387523653efa0039f8e1c89bb74a30504e76ee9f565e25c9a09841f9427b05
2-
31
# Copyright 2020 Authors of Cilium
42
# SPDX-License-Identifier: Apache-2.0
53

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

1614
# hadolint ignore=SC2215
17-
RUN --mount=type=bind,readwrite,target=/src --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache \
15+
RUN --mount=type=bind,readwrite,target=/src \
16+
--mount=type=cache,target=/root/.cache \
17+
--mount=type=cache,target=/go/pkg/mod \
1818
/src/build-go-deps.sh
1919

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

scripts/build-image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright 2017-2020 Authors of Cilium
44
# SPDX-License-Identifier: Apache-2.0
@@ -7,7 +7,7 @@ set -o errexit
77
set -o pipefail
88
set -o nounset
99

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

1212
with_root_context="${ROOT_CONTEXT:-false}"
1313

scripts/get-image-digest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright 2017-2020 Authors of Cilium
44
# SPDX-License-Identifier: Apache-2.0
@@ -7,7 +7,7 @@ set -o errexit
77
set -o pipefail
88
set -o nounset
99

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

1212
if [ "$#" -ne 1 ] ; then
1313
echo "$0 supports exactly 1 argument"

scripts/lint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright 2017-2020 Authors of Cilium
44
# SPDX-License-Identifier: Apache-2.0
@@ -7,7 +7,7 @@ set -o errexit
77
set -o pipefail
88
set -o nounset
99

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

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

0 commit comments

Comments
 (0)