Skip to content

Commit

Permalink
update nightly Docker build URLs to dev-22 (#15)
Browse files Browse the repository at this point in the history
Co-authored-by: Kevin Ngai <ngaik@geomet-dev-22.cmc.ec.gc.ca>
  • Loading branch information
kngai and Kevin Ngai committed Feb 6, 2024
1 parent 16737e6 commit 28e788c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@

FROM ubuntu:focal

ARG GEOMET_MAPPROXY_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-mapproxy
ARG GEOMET_MAPPROXY_URL=https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-mapproxy

ENV BASEDIR=/data/web/geomet-mapproxy-nightly
ENV DOCKERDIR=${BASEDIR}/docker \
CRONTAB=${BASEDIR}/deploy/nightly/geomet-mapproxy.cron.d \
GEOMET_MAPPROXY_LOGGING_LOGLEVEL=DEBUG \
GEOMET_MAPPROXY_LOGGING_LOGFILE=/tmp/geomet-mapproxy-nightly.log \
GEOMET_MAPPROXY_CACHE_DATA=$BASEDIR/cache_data \
GEOMET_MAPPROXY_CACHE_WMS=https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet \
GEOMET_MAPPROXY_CACHE_WMS=https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet \
GEOMET_MAPPROXY_CACHE_MAPFILE=/opt/geomet/conf/geomet-en.map \
GEOMET_MAPPROXY_CACHE_XML=/opt/geomet/conf/geomet-wms-1.3.0-capabilities-en.xml \
GEOMET_MAPPROXY_URL=$GEOMET_MAPPROXY_URL \
Expand Down
2 changes: 1 addition & 1 deletion deploy/nightly/deploy-nightly-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
BASEDIR=/data/web/geomet-mapproxy-nightly
GEOMET_MAPPROXY_GITREPO=https://github.com/ECCC-MSC/geomet-mapproxy.git
DAYSTOKEEP=7
GEOMET_MAPPROXY_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-mapproxy
GEOMET_MAPPROXY_URL=https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-mapproxy

DATETIME=`date +%Y%m%d`
TIMESTAMP=`date +%Y%m%d.%H%M`
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.ym

# test OGC WMS endpoint
```bash
curl "http://geomet-dev-21.cmc.ec.gc.ca:5091/service?request=GetCapabilities"
curl "http://geomet-dev-22.cmc.ec.gc.ca:5091/service?request=GetCapabilities"
# or
curl "https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-mapproxy/service?request=GetCapabilities"
curl "https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-mapproxy/service?request=GetCapabilities"
```
2 changes: 1 addition & 1 deletion docker/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ services:
geomet-mapproxy:
build:
args:
GEOMET_MAPPROXY_URL: https://geomet-dev-21-nightly.cmc.ec.gc.ca/geomet-mapproxy
GEOMET_MAPPROXY_URL: https://geomet-dev-22-nightly.cmc.ec.gc.ca/geomet-mapproxy
ports:
- "5091:80"
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
restart: unless-stopped
build:
context: ..
hostname: geomet-dev-21-docker.cmc.ec.gc.ca
hostname: geomet-dev-22-docker.cmc.ec.gc.ca
volumes:
- "/tmp:/tmp:rw"
networks:
Expand Down

0 comments on commit 28e788c

Please sign in to comment.