From 71c12cf295fdfe5e1406f7ba5451c101b5f04f2d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 14 Jun 2023 13:30:40 +0200 Subject: [PATCH] Dockerfile: update ALPINE_VERSION to 3.18 This also moves `musl-dev` to the alpine-base stage, due to changes in Alpine 3.18 causing gotestsum build to fail because stdlib.h was missing; #17 5.065 # runtime/cgo #17 5.065 In file included from _cgo_export.c:3: #17 5.065 /usr/include/fortify/stdlib.h:23:15: fatal error: stdlib.h: No such file or directory #17 5.065 23 | #include_next #17 5.065 | ^~~~~~~~~~ alpine 3.17: / # find / | grep stdlib.h /usr/include/c++/12.2.1/tr1/stdlib.h /usr/include/c++/12.2.1/stdlib.h alpine 3.18 / # find / | grep stdlib.h /usr/lib/llvm16/lib/clang/16/include/__clang_hip_stdlib.h /usr/include/fortify/stdlib.h /usr/include/c++/12.2.1/tr1/stdlib.h /usr/include/c++/12.2.1/stdlib.h Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 6a74a63ee278123861121f3be41bbd3b733608ed) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- dockerfiles/Dockerfile.authors | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.lint | 2 +- dockerfiles/Dockerfile.vendor | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 541d79a3bc..217215e7f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_VARIANT=alpine ARG GO_VERSION=1.20.12 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG XX_VERSION=1.1.1 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 diff --git a/dockerfiles/Dockerfile.authors b/dockerfiles/Dockerfile.authors index 95f079a027..278ad769fe 100644 --- a/dockerfiles/Dockerfile.authors +++ b/dockerfiles/Dockerfile.authors @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 FROM alpine:${ALPINE_VERSION} AS gen RUN apk add --no-cache bash git diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 65d8a63795..6f4f8d496a 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.12 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG BUILDX_VERSION=0.11.2 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 2390e2a6ec..dead918ee6 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.12 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG GOLANGCI_LINT_VERSION=v1.52.2 FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor index 63d4d86ec6..96f7ab6dfc 100644 --- a/dockerfiles/Dockerfile.vendor +++ b/dockerfiles/Dockerfile.vendor @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.12 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base