From 42eaf9e226ef66de86bd21c98a4d6d9c2789c57c Mon Sep 17 00:00:00 2001
From: Matthew Jaffee <jaffee@pilosa.com>
Date: Thu, 9 Sep 2021 12:34:48 -0500
Subject: [PATCH] fix docker-build part with appropriate docker-login for new
 Dockerfile

---
 .circleci/config.yml | 12 +++++++++---
 Makefile             |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57e117251..9ab36decd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,7 +163,9 @@ jobs:
       name: golang
     steps:
       - checkout-plus
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
+      - run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
       - run: make docker
       - run: docker run pilosa:$(git describe --tags) help
   dockerhub-upload-unstable:
@@ -171,7 +173,9 @@ jobs:
       name: golang
     steps:
       - checkout-plus
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
+      - run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
       - run: make docker
       - run: docker run pilosa:$(git describe --tags) help
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
@@ -181,7 +185,9 @@ jobs:
       name: golang
     steps:
       - checkout-plus
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
+      - run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
       - run: make docker
       - run: docker run pilosa:$(git describe --tags) help
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
diff --git a/Makefile b/Makefile
index 1e24242bf..bb60f062a 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,9 @@ generate: generate-protoc generate-statik generate-stringer generate-pql
 
 # Create Docker image from Dockerfile
 docker: vendor
-	docker build --build-arg BUILD_FLAGS="${FLAGS}" -t "pilosa:$(VERSION)" .
+	docker build \
+	    --build-arg GO_VERSION=$(GO_VERSION) \
+	    --tag pilosa:$(VERSION) .
 	@echo Created docker image: pilosa:$(VERSION)
 
 # Tag and push a Docker image