Skip to content

Commit 34fae41

Browse files
committed
Dockerfile: add ALPINE_VERSION build-arg
This allows us to pin to a specific version of Alpine, in case the golang:alpine image switches to a newer version, which may at times be incompatible, e.g. see moby/moby#44570 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1b0d6fc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent a60bf81 commit 34fae41

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
ARG BASE_VARIANT=alpine
44
ARG GO_VERSION=1.18.8
5+
ARG ALPINE_VERSION=3.16
56
ARG XX_VERSION=1.1.0
67

78
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
89

9-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS build-base-alpine
10+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build-base-alpine
1011
COPY --from=xx / /
1112
RUN apk add --no-cache clang lld llvm file git
1213
WORKDIR /go/src/github.com/docker/cli

dockerfiles/Dockerfile.dev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.18.8
4+
ARG ALPINE_VERSION=3.16
45

5-
FROM golang:${GO_VERSION}-alpine AS golang
6+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
67
ENV CGO_ENABLED=0
78

89
FROM golang AS esc

dockerfiles/Dockerfile.lint

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.18.8
4+
ARG ALPINE_VERSION=3.16
45
ARG GOLANGCI_LINT_VERSION=v1.45.2
56

6-
FROM golang:${GO_VERSION}-alpine AS build
7+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build
78
ENV CGO_ENABLED=0
89
RUN apk add --no-cache git
910
ARG GOLANGCI_LINT_VERSION
@@ -12,7 +13,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
1213
--mount=type=cache,target=/go/pkg/mod \
1314
go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
1415

15-
FROM golang:${GO_VERSION}-alpine AS lint
16+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint
1617
ENV GO111MODULE=off
1718
ENV CGO_ENABLED=0
1819
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1

0 commit comments

Comments
 (0)