diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2020-01-10 14:32:46 +0100 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2020-01-10 15:31:12 +0100 |
| commit | 95a47029433d21031e77f1546d4a7352f7f92a1f (patch) | |
| tree | 1b334304da2541cd30120a42bbb1cd8b9116981f | |
| parent | f7065313ec87960bde830a1092331d4cf91a826c (diff) | |
| download | docker-95a47029433d21031e77f1546d4a7352f7f92a1f.tar.gz | |
Dockerfile: also build old registry on armhf
Building the old version of the registry is not supported
on arm64, but building on armhf is possible.
Before using a multi-arch Dockerfile, the registry was
built on armhf as well, but this got lost in the transition
in commit f1701a741d77a92d28138944193e23aabfc74abe.
This commit re-enables building the old registry on armhf.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| -rw-r--r-- | Dockerfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 87eed4ea89..e57a7e4d1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,10 +37,12 @@ RUN mkdir -p /usr/src/criu \ && make PREFIX=/build/ install-criu FROM base AS registry -# Install two versions of the registry. The first is an older version that -# only supports schema1 manifests. The second is a newer version that supports -# both. This allows integration-cli tests to cover push/pull with both schema1 -# and schema2 manifests. +# 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 RUN --mount=type=cache,target=/root/.cache/go-build \ @@ -52,7 +54,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ && GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \ go build -buildmode=pie -o /build/registry-v2 github.com/docker/distribution/cmd/registry \ && case $(dpkg --print-architecture) in \ - amd64|ppc64*|s390x) \ + amd64|armhf|ppc64*|s390x) \ (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1"); \ GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \ go build -buildmode=pie -o /build/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \ |