Use same env var in Dockerfile and Makefile

Ensures that build tags get set in the Dockerfile so that OSS and GCS drivers
are built into the official registry binary.

Closes #2819

Signed-off-by: Ryan Abrams <rdabrams@gmail.com>
This commit is contained in:
Ryan Abrams 2019-01-16 11:14:22 -08:00
parent 62994fdd12
commit bf74e4f91d

View file

@ -1,7 +1,7 @@
FROM golang:1.11-alpine AS build FROM golang:1.11-alpine AS build
ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
ENV DOCKER_BUILDTAGS include_oss include_gcs ENV BUILDTAGS include_oss include_gcs
ARG GOOS=linux ARG GOOS=linux
ARG GOARCH=amd64 ARG GOARCH=amd64