diff options
| author | Clark Laughlin <clark.laughlin@linaro.org> | 2015-10-26 14:09:33 -0400 |
|---|---|---|
| committer | Clark Laughlin <clark.laughlin@linaro.org> | 2015-10-26 14:09:33 -0400 |
| commit | 90b4496ddd0a9b9c7960038faac6868dd7cc99f6 (patch) | |
| tree | f152b4d9173e51256b89ee5a142ea4f4aaf677b0 | |
| parent | 1b719a920ad7cc16057870a98dc080ac6a14cf01 (diff) | |
update to link to registry container, use correct DNS names
| -rwxr-xr-x | docker-start-containers | 14 | ||||
| -rw-r--r-- | registry-browser/Dockerfile | 2 | ||||
| -rw-r--r-- | registry-browser/server.go | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/docker-start-containers b/docker-start-containers index 832e392..41f3e99 100755 --- a/docker-start-containers +++ b/docker-start-containers @@ -1,14 +1,18 @@ #!/bin/bash DOCKER_WEBSERVER_VIRTUAL_HOST=docker.linaro.org +DOCKER_REGISTRY_VIRTUAL_HOST=docker-registry.linaro.org -DOCKER_REGISTRY_VIRTUAL_HOST=docker.linaro.org -#DOCKER_REGISTRY_VIRTUAL_HOST=docker-registry.linaro.org - -WEB_DATA_DIR=/srv/reporting-portal/data/docker-linaro-org/web-data +#WEB_DATA_DIR=/srv/reporting-portal/data/docker-linaro-org/web-data REGISTRY_DATA_DIR=/srv/reporting-portal/data/docker-linaro-org/registry -# start the web server container +# start the registry browser web server container +docker run -d --name docker-registry-webserver \ + --restart=always \ + -e VIRTUAL_HOST=${DOCKER_WEBSERVER_VIRTUAL_HOST} \ + --link docker-registry-v2:registry \ + docker-registry-browser + #docker run -d --name docker-web-server \ # --restart=always \ # -e VIRTUAL_HOST=${DOCKER_WEBSERVER_VIRTUAL_HOST} \ diff --git a/registry-browser/Dockerfile b/registry-browser/Dockerfile index a7d82b0..d3859bd 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 -registry=https://docker.linaro.org +ENTRYPOINT /goproj/bin/docker-registry-browser -registry=https://registry # Document that the service listens on port 8080. EXPOSE 8080 diff --git a/registry-browser/server.go b/registry-browser/server.go index 1111569..1c8857f 100644 --- a/registry-browser/server.go +++ b/registry-browser/server.go @@ -15,7 +15,7 @@ import ( var ( ignoreCertErrors = flag.Bool("ignoreCertErrors", true, "Ignore certificate errors") listenAddr = flag.String("listen", ":80", "HTTP service address") - registryServer = flag.String("registry", "http://registry:5000", "Docker registry endpoint") + registryServer = flag.String("registry", "https://registry", "Docker registry endpoint") ) |