From 9e632c6b6f7aef515f3909c5dcf3b688d738a618 Mon Sep 17 00:00:00 2001 From: "tomas.panik" Date: Thu, 14 Dec 2023 23:46:38 +0100 Subject: [PATCH] NH-68604: Updating base image to alpine:18 * ECR does support alpine:18 - https://github.com/aws/containers-roadmap/issues/2027 * ECR does NOT support alpine:19 yet - https://github.com/aws/containers-roadmap/issues/2237 --- build/docker/Dockerfile | 2 +- build/docker/structure-test.yaml | 2 +- build/swi-k8s-opentelemetry-collector.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index d7636fd8..59746d34 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -27,7 +27,7 @@ FROM base as wrapper WORKDIR /src/src/wrapper RUN CGO_ENABLED=0 GOEXPERIMENT=boringcrypto go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /bin/wrapper && chmod +x /bin/wrapper -FROM alpine:3.19 +FROM alpine:3.18 RUN apk --update add ca-certificates ARG USER_UID=10001 diff --git a/build/docker/structure-test.yaml b/build/docker/structure-test.yaml index 6ee3324f..f67900b6 100644 --- a/build/docker/structure-test.yaml +++ b/build/docker/structure-test.yaml @@ -17,4 +17,4 @@ commandTests: - name: "swi-otelcol is working in the image" command: "/swi-otelcol" args: ["-v"] - expectedOutput: ["swi-k8s-opentelemetry-collector version 0.8.13"] + expectedOutput: ["swi-k8s-opentelemetry-collector version 0.9.1"] diff --git a/build/swi-k8s-opentelemetry-collector.yaml b/build/swi-k8s-opentelemetry-collector.yaml index 2881d6b4..b8c23ccc 100644 --- a/build/swi-k8s-opentelemetry-collector.yaml +++ b/build/swi-k8s-opentelemetry-collector.yaml @@ -2,7 +2,7 @@ dist: name: swi-k8s-opentelemetry-collector description: "SolarWinds distribution for OpenTelemetry" otelcol_version: "0.81.0" - version: "0.8.13" + version: "0.9.1" exporters: - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0