From 86cbd63dc2ec9048512812ad1ff5a2bbefe7567f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 17 Jul 2022 09:41:32 +0200
Subject: [PATCH] Update base images (#1024)

update alpine base image to current stable
and cross-build with golang v1.18
---
 .woodpecker/docker.yml                    | 2 +-
 docker/Dockerfile.agent.alpine.multiarch  | 2 +-
 docker/Dockerfile.cli.alpine.multiarch    | 2 +-
 docker/Dockerfile.server.alpine.multiarch | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index deeb7c455..88ef0f62a 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -19,7 +19,7 @@ pipeline:
       - yarn build
 
   cross-compile-server:
-    image: techknowlogick/xgo:go-1.17.x
+    image: techknowlogick/xgo:go-1.18.x
     commands:
       - apt update
       - apt install -y tree
diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch
index 124e5e76a..7ae148714 100644
--- a/docker/Dockerfile.agent.alpine.multiarch
+++ b/docker/Dockerfile.agent.alpine.multiarch
@@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
     make build-agent
 
-FROM alpine:3.14
+FROM alpine:3.16
 RUN apk add -U --no-cache ca-certificates
 ENV GODEBUG=netdns=go
 EXPOSE 3000
diff --git a/docker/Dockerfile.cli.alpine.multiarch b/docker/Dockerfile.cli.alpine.multiarch
index 352e4b4c5..d96121064 100644
--- a/docker/Dockerfile.cli.alpine.multiarch
+++ b/docker/Dockerfile.cli.alpine.multiarch
@@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
     make build-cli
 
-FROM alpine:3.14
+FROM alpine:3.16
 RUN apk add -U --no-cache ca-certificates
 ENV GODEBUG=netdns=go
 
diff --git a/docker/Dockerfile.server.alpine.multiarch b/docker/Dockerfile.server.alpine.multiarch
index 9f1a3fe4c..7b3bc9dd4 100644
--- a/docker/Dockerfile.server.alpine.multiarch
+++ b/docker/Dockerfile.server.alpine.multiarch
@@ -1,4 +1,5 @@
-FROM alpine:3.14
+FROM alpine:3.16
+
 ARG TARGETOS TARGETARCH
 RUN apk add -U --no-cache ca-certificates
 ENV GODEBUG=netdns=go