Skip to content

Commit 1b0d6fc

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 <[email protected]>
1 parent 64c8976 commit 1b0d6fc

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

Dockerfile

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

33
ARG BASE_VARIANT=alpine
44
ARG GO_VERSION=1.19.3
5+
ARG ALPINE_VERSION=3.16
56
ARG XX_VERSION=1.1.1
67
ARG GOVERSIONINFO_VERSION=v1.3.0
78
ARG GOTESTSUM_VERSION=v1.8.2
89
ARG BUILDX_VERSION=0.9.0
910

1011
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
1112

12-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS build-base-alpine
13+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build-base-alpine
1314
COPY --from=xx / /
1415
RUN apk add --no-cache bash clang lld llvm file git
1516
WORKDIR /go/src/github.com/docker/cli

dockerfiles/Dockerfile.authors

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

3-
FROM alpine:3.14 AS gen
3+
ARG ALPINE_VERSION=3.16
4+
5+
FROM alpine:${ALPINE_VERSION} AS gen
46
RUN apk add --no-cache bash git
57
WORKDIR /src
68
RUN --mount=type=bind,target=. \

dockerfiles/Dockerfile.dev

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

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

56
ARG BUILDX_VERSION=0.9.0
67
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx
78

8-
FROM golang:${GO_VERSION}-alpine AS golang
9+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
910
ENV CGO_ENABLED=0
1011

1112
FROM golang AS gofumpt

dockerfiles/Dockerfile.lint

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

33
ARG GO_VERSION=1.19.3
4+
ARG ALPINE_VERSION=3.16
45
ARG GOLANGCI_LINT_VERSION=v1.49.0
56

67
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
78

8-
FROM golang:${GO_VERSION}-alpine AS lint
9+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint
910
ENV GO111MODULE=off
1011
ENV CGO_ENABLED=0
1112
ENV GOGC=75

dockerfiles/Dockerfile.vendor

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

33
ARG GO_VERSION=1.19.3
4+
ARG ALPINE_VERSION=3.16
45
ARG MODOUTDATED_VERSION=v0.8.0
56

6-
FROM golang:${GO_VERSION}-alpine AS base
7+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
78
RUN apk add --no-cache bash git rsync
89
WORKDIR /src
910

0 commit comments

Comments
 (0)