fix build of registry browser docker image

3 files changed, 3 insertions, 34 deletions

diff --git a/build-local-images b/build-local-images
index 6d3f319..cb14cde 100755
--- a/build-local-images
+++ b/build-local-images
@@ -9,7 +9,8 @@ if [ ! -z "${check_portus_image}" ] ; then
     docker rmi local/registry-browser
 fi
 pushd registry-browser
-docker build --tag=local/registry-browser -f ${BASE}/registry-browser.dockerfile .
+docker build --tag=local/registry-browser .
+popd
 
 # clone SUSE/Portus
 if [ -d ${PORTUS_SOURCE} ]; then
diff --git a/registry-browser.dockerfile b/registry-browser.dockerfile
deleted file mode 100644
index 3a1cd24..0000000
--- a/registry-browser.dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-RUN apt-get install -y build-essential git wget curl mercurial
-
-RUN mkdir /goproj
-
-ENV GOPATH=/goproj
-ENV PATH=/goproj/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# install golang from source
-RUN wget -qO- https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/local -xzf -
-
-# create gopath directories
-RUN mkdir -p /goproj
-RUN mkdir -p /goproj/bin
-RUN mkdir -p /goproj/pkg
-RUN mkdir -p /goproj/src/linaro.org/docker-registry-browser
-
-# get dependencies
-RUN go get github.com/gorilla/mux
-
-# Copy the local package files to the container's workspace.
-ADD . /goproj/src/linaro.org/docker-registry-browser
-
-WORKDIR /goproj/src/linaro.org/docker-registry-browser
-RUN go install .
-
-# Run the golang server app when the container starts.
-ENTRYPOINT /goproj/bin/docker-registry-browser -registry=https://docker-registry.linaro.org -user=portus -password=L1nar0Docker
-
-# Document that the service listens on port 80
-EXPOSE 80
diff --git a/registry-browser/Dockerfile b/registry-browser/Dockerfile
index 0e4453c..3a1cd24 100644
--- a/registry-browser/Dockerfile
+++ b/registry-browser/Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /goproj/src/linaro.org/docker-registry-browser
 RUN go install .
 
 # Run the golang server app when the container starts.
-ENTRYPOINT /goproj/bin/docker-registry-browser -type=quay.io -namespace=linaro -registry=https://quay.io
+ENTRYPOINT /goproj/bin/docker-registry-browser -registry=https://docker-registry.linaro.org -user=portus -password=L1nar0Docker
 
 # Document that the service listens on port 80
 EXPOSE 80