mirror of https://github.com/docker/cli.git
Merge pull request #3521 from thaJeztah/20.10_backport_dockerfile_update_xx
[20.10 backport] Dockerfile: update xx to 1.1
This commit is contained in:
commit
b10a23a46f
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
ARG BASE_VARIANT=alpine
|
ARG BASE_VARIANT=alpine
|
||||||
ARG GO_VERSION=1.16.15
|
ARG GO_VERSION=1.16.15
|
||||||
ARG XX_VERSION=1.0.0-rc.2
|
ARG XX_VERSION=1.1.0
|
||||||
|
|
||||||
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable
|
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
|
FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
|
||||||
|
@ -55,7 +55,7 @@ RUN --mount=ro --mount=type=cache,target=/root/.cache \
|
||||||
TARGET=/out ./scripts/build/binary && \
|
TARGET=/out ./scripts/build/binary && \
|
||||||
xx-verify $([ "$GO_LINKMODE" = "static" ] && echo "--static") /out/docker
|
xx-verify $([ "$GO_LINKMODE" = "static" ] && echo "--static") /out/docker
|
||||||
|
|
||||||
FROM build-base-${BASE_VARIANT} AS dev
|
FROM build-base-${BASE_VARIANT} AS dev
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
FROM scratch AS binary
|
FROM scratch AS binary
|
||||||
|
|
Loading…
Reference in New Issue