From ba984e6ec2c0e5e661d0ff97a0829569b2901d55 Mon Sep 17 00:00:00 2001 From: Ioannis Gakos Date: Mon, 2 Sep 2024 16:41:21 +0300 Subject: [PATCH] Fix Docker builds after upgrade to 1.23 --- CONTRIBUTING.md | 4 ++-- docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 30d73864..475915c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ sudo /opt/metrikad/metrikad-{protocol} --version ### Development environment To work on an agent development you will need: * GNU `make` -* Go `1.18` or later +* Go `1.23` or later To ensure everything is set up correctly, simply run `make build`, which should build every metrika agent binary version for your architecture. @@ -52,4 +52,4 @@ Exporters can be implemented to encode the data in any desirable format and prod `exporter.HandleMessage()` method will be called for every Message (Metric or Event) arriving from the Agent watchers. If the exporter implementation cannot keep up with the data flow, newly collected Messages will eventually be dropped. As such, it's recommended to implement buffering in the exporter implementation. -Exporters are implemented under [contrib](internal/pkg/contrib) package, and an exporter constructor must be registered with `ExportersMap` variable in [exporter.go](internal/pkg/contrib/exporter.go). \ No newline at end of file +Exporters are implemented under [contrib](internal/pkg/contrib) package, and an exporter constructor must be registered with `ExportersMap` variable in [exporter.go](internal/pkg/contrib/exporter.go). diff --git a/docker/Dockerfile b/docker/Dockerfile index 3b93c966..f5a4d823 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 -FROM --platform=$BUILDPLATFORM golang:1.18.6 as builder-amd64 +FROM --platform=$BUILDPLATFORM golang:1.22.6 as builder-amd64 ENV CC "gcc" -FROM --platform=$BUILDPLATFORM golang:1.18.6 as builder-arm64 +FROM --platform=$BUILDPLATFORM golang:1.22.6 as builder-arm64 ENV CC "aarch64-linux-gnu-gcc" ENV CGO_ENABLED "1"