From b326049db883c87b6e79d3ce9591c9f09a429ff7 Mon Sep 17 00:00:00 2001
From: Joel Takvorian <joel.takvorian@qaraywa.net>
Date: Mon, 15 Jan 2024 16:13:43 +0100
Subject: [PATCH] NETOBSERV-1451: Bump ubi 9.3 / go 1.21 (#247)
---
.golangci.yml | 2 +-
Dockerfile | 4 ++--
examples/performance/Dockerfile_packet_counter | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index dacbd203..42088e4f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -18,7 +18,7 @@ linters:
- unused
linters-settings:
stylecheck:
- go: "1.20"
+ go: "1.21"
gocritic:
enabled-checks:
- hugeParam
diff --git a/Dockerfile b/Dockerfile
index 299577e8..ae8f3cbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BUILDPLATFORM=linux/amd64
ARG TARGETARCH=amd64
# Build the manager binary
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as builder
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21 as builder
ARG TARGETARCH
ARG TARGETPLATFORM
@@ -27,7 +27,7 @@ COPY .mk/ .mk/
RUN GOARCH=$TARGETARCH make compile
# Create final image from minimal + built binary
-FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/ubi-minimal:9.2
+FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/ubi-minimal:9.3
WORKDIR /
COPY --from=builder /opt/app-root/bin/netobserv-ebpf-agent .
USER 65532:65532
diff --git a/examples/performance/Dockerfile_packet_counter b/examples/performance/Dockerfile_packet_counter
index 0b44bcba..437d1854 100644
--- a/examples/performance/Dockerfile_packet_counter
+++ b/examples/performance/Dockerfile_packet_counter
@@ -1,6 +1,6 @@
# this file has to be built from the project root directory
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
WORKDIR /app
--
GitLab