diff --git a/Dockerfile b/Dockerfile index b8baa25..76d5a9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:focal # Allow for change during docker build-time -ARG GEOMET_CLIMATE_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-climate +ARG GEOMET_CLIMATE_URL=https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-climate ENV BASEDIR=/data/web/geomet-climate-nightly \ DOCKERDIR=/data/web/geomet-climate-nightly/docker \ diff --git a/deploy/nightly-docker/deploy-nightly-docker.sh b/deploy/nightly-docker/deploy-nightly-docker.sh index afedb78..31765e5 100644 --- a/deploy/nightly-docker/deploy-nightly-docker.sh +++ b/deploy/nightly-docker/deploy-nightly-docker.sh @@ -45,7 +45,6 @@ rm -fr latest echo "Generating nightly build for $TIMESTAMP" mkdir $NIGHTLYDIR && cd $NIGHTLYDIR git clone $GEOMET_CLIMATE_GITREPO . -b master --depth=1 -# git clone https://github.com/kngai/geomet-climate.git . -b docker-nightly --depth=1 echo "Stopping/building/starting Docker setup" docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml build --no-cache diff --git a/docker/README.md b/docker/README.md index 4b123b2..e789d17 100644 --- a/docker/README.md +++ b/docker/README.md @@ -9,5 +9,5 @@ docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.ym docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml up -d # test WMS endpoint -curl "http://geomet-dev-21.cmc.ec.gc.ca:8099/?service=WMS&version=1.3.0&request=GetCapabilities" +curl "http://geomet-dev-22.cmc.ec.gc.ca:8099/?service=WMS&version=1.3.0&request=GetCapabilities" ``` diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml index be682e4..cfe9f8f 100644 --- a/docker/docker-compose.override.yml +++ b/docker/docker-compose.override.yml @@ -2,8 +2,8 @@ services: geomet-climate-nightly: build: args: - GEOMET_CLIMATE_URL: https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-climate - # GEOMET_CLIMATE_URL: http://geomet-dev-21.cmc.ec.gc.ca:8099 + GEOMET_CLIMATE_URL: https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-climate + # GEOMET_CLIMATE_URL: http://geomet-dev-22.cmc.ec.gc.ca:8099 environment: GEOMET_CLIMATE_OWS_DEBUG: 5 GEOMET_CLIMATE_ES_URL: http://${GEOMET_CLIMATE_ES_USERNAME}:${GEOMET_CLIMATE_ES_PASSWORD}@localhost:9200 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index aeac15b..9ddebe4 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,7 @@ services: build: context: .. network_mode: host - hostname: geomet-dev-21-docker.cmc.ec.gc.ca + hostname: geomet-dev-22-docker.cmc.ec.gc.ca extra_hosts: - "host.docker.internal:host-gateway" volumes: