From ceef252a24ebfabcc085ca503e847c9de5ff2256 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Mon, 20 Apr 2020 17:24:37 +0200
Subject: [PATCH] containerized-build: use GOROOT variable everywhere

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 scripts/Dockerfile.devel | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel
index 00879cbb5..590fd8651 100644
--- a/scripts/Dockerfile.devel
+++ b/scripts/Dockerfile.devel
@@ -1,13 +1,14 @@
 FROM ceph/ceph:v15
 
+ARG GOROOT=/usr/local/go
+
 ENV GOPATH=/go \
- GOROOT=/usr/local/go \
- GO111MODULE=on
+ GOROOT=${GOROOT} \
+ GO111MODULE=on \
+ PATH="${GOROOT}/bin:${GOPATH}/bin:${PATH}"
 
 RUN mkdir -p /usr/local/go && \
- curl https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar xzf - -C /usr/local/go --strip-components=1
-
-ENV PATH="$GOROOT/bin:$GOPATH/bin:$PATH"
+ curl https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar xzf - -C ${GOROOT} --strip-components=1
 
 RUN dnf -y install \
 	git \