DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Go: Bump to v1.22.5. (#11732)

Browse source 
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
This commit is contained in:
k8s-infra-cherrypick-robot 2024-08-05 08:33:22 -07:00 • committed by GitHub
parent 16cd212667
commit 0f8b04ac0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
images/opentelemetry/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License.
FROM alpine:3.20.0 as base
FROM alpine:3.20.0 AS base
RUN mkdir -p /opt/third_party/install
COPY . /opt/third_party/
@ -24,14 +24,14 @@ RUN apk update \
&& apk add -U bash \
&& bash /opt/third_party/build.sh -p
ENV NINJA_STATUS "[%p/%f/%t] "
ENV NINJA_STATUS="[%p/%f/%t] "
# install otel_ngx_module.so
FROM base as nginx
FROM base AS nginx
ARG NGINX_VERSION=1.25.3
RUN bash /opt/third_party/build.sh -n ${NGINX_VERSION}
FROM golang:1.21.6-bullseye as build-init
FROM golang:1.22.5-bullseye AS build-init
WORKDIR /go/src/app
COPY . .
@ -39,7 +39,7 @@ COPY . .
RUN go mod download
RUN CGO_ENABLED=0 go build -o /go/bin/init_module
FROM gcr.io/distroless/static-debian11 as final
FROM gcr.io/distroless/static-debian11 AS final
COPY --from=build-init /go/bin/init_module /
COPY --from=nginx /etc/nginx/modules /etc/nginx/modules

5
images/opentelemetry/rootfs/build.sh
View file

@ -52,7 +52,10 @@ Help()
prepare()
{
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
apk add \
linux-headers \
cmake \

2
images/opentelemetry/rootfs/go.mod
View file

@ -1,3 +1,3 @@
module init-otel
go 1.21
go 1.22.5