X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=blobdiff_plain;f=docker-build%2Fregistry%2FDockerfile;h=090f6c7d2956d504b879bde92a4bd9aea712d9dc;hp=80cc4dc1729aafe1d28b2552b3f7765de53184b0;hb=4813836b226f3b4c2a2a11a1dffa35cfb1c05aa1;hpb=0b89aad6aa6de18c1cc71425fd9f20c97c5c419b

diff --git a/docker-build/registry/Dockerfile b/docker-build/registry/Dockerfile
index 80cc4dc..090f6c7 100644
--- a/docker-build/registry/Dockerfile
+++ b/docker-build/registry/Dockerfile
@@ -17,25 +17,33 @@ MAINTAINER Balint Varga <balint.varga@nokia.com>
 
 ARG REGISTRY
 ENV REGISTRY_VERSION=$REGISTRY
+ARG go_install_dir="/usr/local/go"
+ARG go_version
 ENV GOPATH /build
-ENV PATH /usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH $go_install_dir/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ENV DOCKER_BUILDTAGS include_oss include_gcs
 
-WORKDIR ${GOPATH}/src/github.com/docker/distribution
 COPY common_scripts/wait-for-files /usr/bin/
 COPY mainstart.sh /
 
 RUN adduser -u 149 -D -H -s /sbin/nologin dockerreg \
 &&  chmod +x /mainstart.sh /usr/bin/wait-for-files \
 \
-&&  apk add --no-cache --virtual .build-deps build-base go godep git curl tar \
-&&  curl -fsSL -k https://github.com/docker/distribution/archive/v${REGISTRY_VERSION}.tar.gz | tar zx --strip-components=1 \
+&&  apk add --no-cache --virtual .build-deps build-base go godep git curl tar bash \
+&&  mkdir -p $go_install_dir \
+&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&&  cd ${go_install_dir}/src/ \
+&&  ./make.bash \
+&&  mkdir -p ${GOPATH}/src/github.com/docker/distribution \
+&&  curl -fsSL -k https://github.com/docker/distribution/archive/v${REGISTRY_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/github.com/docker/distribution \
+&&  cd ${GOPATH}/src/github.com/docker/distribution \
 &&  go get -d -v \
 &&  make PREFIX=/build clean binaries \
 &&  mv ${GOPATH}/src/github.com/docker/distribution/bin/registry /usr/bin/ \
 \
 &&  apk del .build-deps \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build
 
 WORKDIR /