From 23f6bdd743fca081a1c0ba0e6ae4c0223c24e0f2 Mon Sep 17 00:00:00 2001
From: Ryan Abrams <rdabrams@gmail.com>
Date: Wed, 16 Jan 2019 11:14:22 -0800
Subject: [PATCH] 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>
(cherry picked from commit bf74e4f91d114a3fc8e8ab1249f99c15e12bef94)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2a8da773..5f00081c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.13.4-alpine AS build
 
 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 GOARCH=amd64