Skip to content
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.

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

chore(deps): update docker.io/library/golang docker tag to v1.20.10 (v1.13) #28516

Merged
merged 2 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-images-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
target: release
build-args: |
BASE_IMAGE=quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40
BASE_IMAGE=quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
target: release
build-args: |
BASE_IMAGE=quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40
BASE_IMAGE=quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion api/v1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
include ../../Makefile.defs

# Update this via images/scripts/update-cilium-builder-image.sh
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:cd326468efea7b4a0a396b2b9367dc5adeb29c36@sha256:63e917d576887cfc2538546644e4ecdcd6c4eda9523409e79573febb36fef2e1
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:bfc29201edf9ab546697c7a78ca704c9a24627f7@sha256:3b9cd77a8dad99698fa96b08622e5afdcee06c69bdfeca6cdf0ea121e3685c57

.PHONY: proto
proto:
Expand Down
4 changes: 2 additions & 2 deletions images/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# SPDX-License-Identifier: Apache-2.0

ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:5569a29cea6b3ad50aeb03102aaf3dc03841197c@sha256:b15dbedb7c49816c74a765e2f6ecdb9359763b8e4e4328d794f48b9cefae9804
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79

FROM ${COMPILERS_IMAGE} as compilers-image
Expand Down
2 changes: 1 addition & 1 deletion images/cilium-docker-plugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
# Represents the plataform where the build is happening, do not mix with
Expand Down
4 changes: 2 additions & 2 deletions images/cilium/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:cd326468efea7b4a0a396b2b9367dc5adeb29c36@sha256:63e917d576887cfc2538546644e4ecdcd6c4eda9523409e79573febb36fef2e1
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:bfc29201edf9ab546697c7a78ca704c9a24627f7@sha256:3b9cd77a8dad99698fa96b08622e5afdcee06c69bdfeca6cdf0ea121e3685c57
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6


# cilium-envoy from github.com/cilium/proxy
Expand Down
2 changes: 1 addition & 1 deletion images/clustermesh-apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994
ARG ALPINE_IMAGE=docker.io/library/alpine:3.17.5@sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/hubble-relay/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994
ARG ALPINE_IMAGE=docker.io/library/alpine:3.17.5@sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994
ARG ALPINE_IMAGE=docker.io/library/alpine:3.17.5@sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.8@sha256:6b29720c5598cb40b23dd38f522050a698d427c3a5696c5efe1ed22bd45b1396
ARG GOLANG_IMAGE=docker.io/library/golang:1.20.10@sha256:ed6c4a5918b0a1ffb97970f6493d742dc5c7ebf3ccbd417c215d52830b57b994
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.04@sha256:9b8dec3bf938bc80fbe758d856e96fdfab5f56c39d44b0cff351e847bb1b01ea

ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-gke.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {
)}"""
BASE_IMAGE="""${sh(
returnStdout: true,
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40"; fi'
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6"; fi'
)}"""
}

Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/kubernetes-upstream.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:35659745b6c348633a6b0c005f35b23f69270634@sha256:8660ac35181b0e862da96d65fb7782d6601752038410f80393ec6c73338a0e40"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:f7e9af8a7709a394e67cdd42fde3920415d901ed@sha256:f5b41b3f0ec28c2c33e2dc4b0ad35c242c4fe782c2cb0fc068ba796d53ce5da6"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/k8s/manifests/demo-customcalls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
spec:
containers:
- name: cilium-builder
image: quay.io/cilium/cilium-builder:cd326468efea7b4a0a396b2b9367dc5adeb29c36@sha256:63e917d576887cfc2538546644e4ecdcd6c4eda9523409e79573febb36fef2e1
image: quay.io/cilium/cilium-builder:bfc29201edf9ab546697c7a78ca704c9a24627f7@sha256:3b9cd77a8dad99698fa96b08622e5afdcee06c69bdfeca6cdf0ea121e3685c57
workingDir: /cilium
command: ["sleep"]
args:
Expand Down