From b954e4793bd204c847b271545af4f19f145d4e54 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 Aug 2021 13:57:40 +0200 Subject: [PATCH] Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 95 ++++++++++++------- .../install/golangci_lint.installer | 10 -- hack/dockerfile/install/gotestsum.installer | 9 -- hack/dockerfile/install/shfmt.installer | 8 -- hack/dockerfile/install/tomll.installer | 8 -- hack/dockerfile/install/vndr.installer | 8 -- 6 files changed, 59 insertions(+), 79 deletions(-) delete mode 100755 hack/dockerfile/install/golangci_lint.installer delete mode 100755 hack/dockerfile/install/gotestsum.installer delete mode 100755 hack/dockerfile/install/shfmt.installer delete mode 100755 hack/dockerfile/install/tomll.installer delete mode 100755 hack/dockerfile/install/vndr.installer diff --git a/Dockerfile b/Dockerfile index be8d8025d4..feeb54006c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,14 +30,19 @@ RUN --mount=type=cache,sharing=locked,id=moby-criu-aptlib,target=/var/lib/apt \ FROM base AS registry WORKDIR /go/src/github.com/docker/distribution -# Install two versions of the registry. The first one is a recent version that -# supports both schema 1 and 2 manifests. The second one is an older version that -# only supports schema1 manifests. This allows integration-cli tests to cover -# push/pull with both schema1 and schema2 manifests. -# The old version of the registry is not working on arm64, so installation is -# skipped on that architecture. -ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd -ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827 + +# REGISTRY_COMMIT specifies the version of the registry to build and install +# from the https://github.com/docker/distribution repository. This version of +# the registry is used to test both schema 1 and schema 2 manifests. Generally, +# the version specified here should match a current release. +ARG REGISTRY_COMMIT=47a064d4195a9b56133891bbb13620c3ac83a827 + +# REGISTRY_COMMIT_SCHEMA1 specifies the version of the regsitry to build and +# install from the https://github.com/docker/distribution repository. This is +# an older (pre v2.3.0) version of the registry that only supports schema1 +# manifests. This version of the registry is not working on arm64, so installation +# is skipped on that architecture. +ARG REGISTRY_COMMIT_SCHEMA1=ec87e9b6971d831f0eff752ddb54fb64693e51cd RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ --mount=type=tmpfs,target=/go/src/ \ @@ -56,8 +61,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM base AS swagger WORKDIR $GOPATH/src/github.com/go-swagger/go-swagger -# Install go-swagger for validating swagger.yaml -# This is https://github.com/kolyshkin/go-swagger/tree/golang-1.13-fix + +# GO_SWAGGER_COMMIT specifies the version of the go-swagger binary to build and +# install. Go-swagger is used in CI for validating swagger.yaml in hack/validate/swagger-gen +# +# Currently uses a fork from https://github.com/kolyshkin/go-swagger/tree/golang-1.13-fix, # TODO: move to under moby/ or fix upstream go-swagger to work for us. ENV GO_SWAGGER_COMMIT c56166c036004ba7a3a321e5951ba472b9ae298c RUN --mount=type=cache,target=/root/.cache/go-build \ @@ -105,7 +113,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/ crossbuild-essential-ppc64el \ crossbuild-essential-s390x -FROM cross-${CROSS} as dev-base +FROM cross-${CROSS} AS dev-base FROM dev-base AS runtime-dev-cross-false ARG DEBIAN_FRONTEND @@ -142,18 +150,30 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/ FROM runtime-dev-cross-${CROSS} AS runtime-dev FROM base AS tomll -ARG GOTOML_VERSION +# GOTOML_VERSION specifies the version of the tomll binary to build and install +# from the https://github.com/pelletier/go-toml repository. This binary is used +# in CI in the hack/validate/toml script. +# +# When updating this version, consider updating the github.com/pelletier/go-toml +# dependency in vendor.conf accordingly. +ARG GOTOML_VERSION=v1.8.1 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install/tomll.installer,target=/tmp/install/tomll.installer \ - . /tmp/install/tomll.installer && PREFIX=/build install_tomll + GOBIN=/build/ GO111MODULE=on go install "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}" \ + && /build/tomll --help FROM base AS vndr -ARG VNDR_VERSION +# VNDR_VERSION specifies the version of the vndr tool to build and install +# from the https://github.com/LK4D4/vndr repository. +# +# The vndr tool is used to manage vendored go packages in the vendor directory, +# and is pinned to a fixed version because different versions of this tool +# can result in differences in the (go) files that are considered for vendoring. +ARG VNDR_VERSION=v0.1.2 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh vndr + GOBIN=/build/ GO111MODULE=on go install "github.com/LK4D4/vndr@${VNDR_VERSION}" \ + && /build/vndr --help FROM dev-base AS containerd ARG DEBIAN_FRONTEND @@ -162,47 +182,47 @@ RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/ apt-get update && apt-get install -y --no-install-recommends \ libbtrfs-dev ARG CONTAINERD_VERSION +COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/containerd.installer / RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh containerd + PREFIX=/build /install.sh containerd FROM base AS golangci_lint -ARG GOLANGCI_LINT_VERSION +ARG GOLANGCI_LINT_VERSION=v1.23.8 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh golangci_lint + GOBIN=/build/ GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" \ + && /build/golangci-lint --version FROM base AS gotestsum -ARG GOTESTSUM_VERSION +ARG GOTESTSUM_VERSION=v1.7.0 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh gotestsum + GOBIN=/build/ GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" \ + && /build/gotestsum --version FROM base AS shfmt -ARG SHFMT_VERSION +ARG SHFMT_VERSION=v3.0.2 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh shfmt + GOBIN=/build/ GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \ + && /build/shfmt --version FROM dev-base AS dockercli ARG DOCKERCLI_CHANNEL ARG DOCKERCLI_VERSION +COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/dockercli.installer / RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh dockercli + PREFIX=/build /install.sh dockercli FROM runtime-dev AS runc ARG RUNC_VERSION ARG RUNC_BUILDTAGS +COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/runc.installer / RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh runc + PREFIX=/build /install.sh runc FROM dev-base AS tini ARG DEBIAN_FRONTEND @@ -212,17 +232,20 @@ RUN --mount=type=cache,sharing=locked,id=moby-tini-aptlib,target=/var/lib/apt \ apt-get update && apt-get install -y --no-install-recommends \ cmake \ vim-common +COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/tini.installer / RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh tini + PREFIX=/build /install.sh tini FROM dev-base AS rootlesskit ARG ROOTLESSKIT_VERSION +ARG PREFIX=/build +COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/rootlesskit.installer / RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ - --mount=type=bind,src=hack/dockerfile/install,target=/tmp/install \ - PREFIX=/build /tmp/install/install.sh rootlesskit + /install.sh rootlesskit \ + && "${PREFIX}"/rootlesskit --version \ + && "${PREFIX}"/rootlesskit-docker-proxy --help COPY ./contrib/dockerd-rootless.sh /build COPY ./contrib/dockerd-rootless-setuptool.sh /build diff --git a/hack/dockerfile/install/golangci_lint.installer b/hack/dockerfile/install/golangci_lint.installer deleted file mode 100755 index bcce308e15..0000000000 --- a/hack/dockerfile/install/golangci_lint.installer +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -: "${GOLANGCI_LINT_VERSION=v1.23.8}" - -install_golangci_lint() { - set -e - echo "Install golangci-lint version ${GOLANGCI_LINT_VERSION}" - GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" - "${PREFIX}"/golangci-lint --version -} diff --git a/hack/dockerfile/install/gotestsum.installer b/hack/dockerfile/install/gotestsum.installer deleted file mode 100755 index 5024179958..0000000000 --- a/hack/dockerfile/install/gotestsum.installer +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${GOTESTSUM_VERSION:=v1.7.0} - -install_gotestsum() ( - set -e - echo "Install gotestsum version ${GOTESTSUM_VERSION}" - GOBIN="${PREFIX}" GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" -) diff --git a/hack/dockerfile/install/shfmt.installer b/hack/dockerfile/install/shfmt.installer deleted file mode 100755 index b9a125cfe6..0000000000 --- a/hack/dockerfile/install/shfmt.installer +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -: "${SHFMT_VERSION:=v3.0.2}" - -install_shfmt() { - echo "Install shfmt version $SHFMT_VERSION" - GOBIN="${PREFIX}" GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" -} diff --git a/hack/dockerfile/install/tomll.installer b/hack/dockerfile/install/tomll.installer deleted file mode 100755 index 7277c9817f..0000000000 --- a/hack/dockerfile/install/tomll.installer +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -: "${GOTOML_VERSION:=v1.8.1}" - -install_tomll() { - echo "Install go-toml version ${GOTOML_VERSION}" - GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}" -} diff --git a/hack/dockerfile/install/vndr.installer b/hack/dockerfile/install/vndr.installer deleted file mode 100755 index 5611e3c9d8..0000000000 --- a/hack/dockerfile/install/vndr.installer +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -: "${VNDR_VERSION:=v0.1.2}" - -install_vndr() { - echo "Install vndr version $VNDR_VERSION" - GOBIN="${PREFIX}" GO111MODULE=on go install "github.com/LK4D4/vndr@${VNDR_VERSION}" -}