Skip to content

Commit

Permalink
Dockerfile: add ALPINE_VERSION build-arg
Browse files Browse the repository at this point in the history
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 7b56eba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Dec 4, 2022
1 parent a60bf81 commit af711c3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Expand Up @@ -2,11 +2,12 @@

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.18.8
ARG ALPINE_VERSION=3.16
ARG XX_VERSION=1.1.0

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

FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS build-base-alpine
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT}${ALPINE_VERSION} AS build-base-alpine
COPY --from=xx / /
RUN apk add --no-cache clang lld llvm file git
WORKDIR /go/src/github.com/docker/cli
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/Dockerfile.dev
@@ -1,8 +1,9 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.18.8
ARG ALPINE_VERSION=3.16

FROM golang:${GO_VERSION}-alpine AS golang
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
ENV CGO_ENABLED=0

FROM golang AS esc
Expand Down
5 changes: 3 additions & 2 deletions dockerfiles/Dockerfile.lint
@@ -1,9 +1,10 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.18.8
ARG ALPINE_VERSION=3.16
ARG GOLANGCI_LINT_VERSION=v1.45.2

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

FROM golang:${GO_VERSION}-alpine AS lint
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS lint
ENV GO111MODULE=off
ENV CGO_ENABLED=0
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
Expand Down

0 comments on commit af711c3

Please sign in to comment.