Skip to content

Commit

Permalink
fix: Using environment variables as default values in deploy files do…
Browse files Browse the repository at this point in the history
…es not work (closed #59)
  • Loading branch information
Christophe Nouguier committed May 3, 2019
1 parent d738d8e commit fd1c5ac
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion deploy/arome-france-high-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
arome-france-high-loader:
image: ${AROME_FRANCE_HIGH_LOADER_IMAGE}:${AROME_FRANCE_HIGH_LOADER_TAG}
environment:
- DB_URL=${WEACAST_LOADERS_DB_URL:-$DB_URL}
- DB_URL=${WEACAST_LOADERS_DB_URL}
networks:
- kargo-network
deploy:
Expand Down
2 changes: 1 addition & 1 deletion deploy/arome-france-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
arome-france-loader:
image: ${AROME_FRANCE_LOADER_IMAGE}:${AROME_FRANCE_LOADER_TAG}
environment:
- DB_URL=${WEACAST_LOADERS_DB_URL:-$DB_URL}
- DB_URL=${WEACAST_LOADERS_DB_URL}
networks:
- kargo-network
deploy:
Expand Down
2 changes: 1 addition & 1 deletion deploy/arpege-europe-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
arpege-europe-loader:
image: ${ARPEGE_EUROPE_LOADER_IMAGE}:${ARPEGE_EUROPE_LOADER_TAG}
environment:
- DB_URL=${WEACAST_LOADERS_DB_URL:-$DB_URL}
- DB_URL=${WEACAST_LOADERS_DB_URL}
networks:
- kargo-network
deploy:
Expand Down
2 changes: 1 addition & 1 deletion deploy/arpege-world-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
arpege-world-loader:
image: ${ARPEGE_WORLD_LOADER_IMAGE}:${ARPEGE_WORLD_LOADER_TAG}
environment:
- DB_URL=${WEACAST_LOADERS_DB_URL:-$DB_URL}
- DB_URL=${WEACAST_LOADERS_DB_URL}
networks:
- kargo-network
deploy:
Expand Down
2 changes: 1 addition & 1 deletion deploy/gfs-world-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
gfs-world-loader:
image: ${GFS_WORLD_LOADER_IMAGE}:${GFS_WORLD_LOADER_TAG}
environment:
- DB_URL=${WEACAST_LOADERS_DB_URL:-$DB_URL}
- DB_URL=${WEACAST_LOADERS_DB_URL}
networks:
- kargo-network
deploy:
Expand Down
4 changes: 2 additions & 2 deletions deploy/kano.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
environment:
- LOG_LEVEL=${KANO_LOG_LEVEL}
- DEBUG=${KANO_DEBUG}
- DB_URL=${KANO_DB_URL:-$DB_URL}
- APP_SECRET=${KANO_APP_SECRET:-$SECRET}
- DB_URL=${KANO_DB_URL}
- APP_SECRET=${KANO_APP_SECRET}
- CESIUM_TOKEN=${KANO_CESIUM_TOKEN}
- SUBDOMAIN
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion deploy/vigicrues-observations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
observations:
image: ${VIGICRUES_OBSERVATIONS_IMAGE}:observations-${VIGICRUES_OBSERVATIONS_TAG}
environment:
- DB_URL=${VIGICRUES_DB_URL:-$DB_URL}
- DB_URL=${VIGICRUES_DB_URL}
deploy:
replicas: 1
placement:
Expand Down
2 changes: 1 addition & 1 deletion deploy/vigicrues-sections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
sections:
image: ${VIGICRUES_SECTIONS_IMAGE}:sections-${VIGICRUES_SECTIONS_TAG}
environment:
- DB_URL=${VIGICRUES_DB_URL:-$DB_URL}
- DB_URL=${VIGICRUES_DB_URL}
deploy:
replicas: 1
placement:
Expand Down
2 changes: 1 addition & 1 deletion deploy/vigicrues-stations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
stations:
image: ${VIGICRUES_STATIONS_IMAGE}:stations-${VIGICRUES_STATIONS_TAG}
environment:
- DB_URL=${VIGICRUES_DB_URL:-$DB_URL}
- DB_URL=${VIGICRUES_DB_URL}
deploy:
replicas: 1
placement:
Expand Down
4 changes: 2 additions & 2 deletions deploy/weacast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ services:
- DEBUG=${WEACAST_DEBUG}
- USE_LOADER=true
- API_ONLY=true
- DB_URL=${WEACAST_DB_URL:-$DB_URL}
- APP_SECRET=${WEACAST_APP_SECRET:-$SECRET}
- DB_URL=${WEACAST_DB_URL}
- APP_SECRET=${WEACAST_APP_SECRET}
- SUBDOMAIN
deploy:
labels:
Expand Down
14 changes: 7 additions & 7 deletions docs/reference/environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ For each stack, there must be such an entry:
| --- | --- | --- |
| `KANO_IMAGE` | The image to be used. | `kalisio/kano` |
| `KANO_TAG` | The version to be used. | `0.1.0-dev` |
| `KANO_APP_SECRET` | The app secret used to authenticate a client. | `$SECRET` |
| `KANO_DB_URL` | The database URL where to write the data. | `$DB_URL` |
| `KANO_APP_SECRET` | The app secret used to authenticate a client. | - |
| `KANO_DB_URL` | The database URL where to write the data. | - |
| `KANO_LOG_LEVEL` | The log level of the application. | `verbose` |
| `KANO_DEBUG` | Enable the debug mode. | `` |
| `KANO_REPLICAS` | The number of replicas. | `1` |
Expand Down Expand Up @@ -127,7 +127,7 @@ $kargo build maputnik
| --- | --- | --- |
| `OPENAQ_IMAGE` | The image to be used. | `kalisio/k-openaq` |
| `OPENAQ_TAG` | The version to be used. | `latest` |
| `OPENAQ_DB_URL` | The database URL where to write the data. | `$DB_URL` |
| `OPENAQ_DB_URL` | The database URL where to write the data. | - |

### PostGis

Expand Down Expand Up @@ -185,16 +185,16 @@ $kargo build maputnik
| `VIGICRUES_STATIONS_TAG` | The version of the image to be used for scraping the stations. | `latest` |
| `VIGICRUES_SECTIONS_TAG` | The version of the image to be used for scraping the sections. | `lastest` |
| `VIGICRUES_OBSERVATIONS_TAG` | The version of the image to be used for scraping the observations. | `latest` |
| `VIGICRUES_DB_URL` | The database URL where to write the data. | `$DB_URL` |
| `VIGICRUES_DB_URL` | The database URL where to write the data. | - |

### Weacast

| Variable | Description | Default value |
| --- | --- | --- |
| `WEACAST_IMAGE` | The image to be used. | `weacast/weacast-dev` |
| `WEACAST_TAG` | The version to be used. | `latest` |
| `WEACAST_APP_SECRET` | The app secret used to authenticate a client. | `$SECRET` |
| `WEACAST_DB_URL` | The database URL where to write the data. | `$DB_URL` |
| `WEACAST_APP_SECRET` | The app secret used to authenticate a client. | - |
| `WEACAST_DB_URL` | The database URL where to write the data. | - |
| `WEACAST_LOG_LEVEL` | The log level of the application. | `verbose` |
| `WEACAST_DEBUG` | Enable the debug mode. | `` |
| `WEACAST_REPLICAS` | The number of replicas. | `1` |
Expand All @@ -205,7 +205,7 @@ $kargo build maputnik
| --- | --- | --- |
| `WEACAST_MODELS` | The list of models to be downloaded. | `"arpege-world arpege-europe arome-france gfs-world"` |
| `WEACAST_LOADERS_TAG` | A default tag value. | `latest` |
| `WEACAST_LOADERS_DB_URL` | The database URL where to write the data. | `$DB_URL` |
| `WEACAST_LOADERS_DB_URL` | The database URL where to write the data. | - |
| `ARPEGE_WOLRD_LOADER_IMAGE` | The image to be used to scrape Arpege World data. | `localhost:5000/arpege-world-loader` |
| `ARPEGE_WORLD_LOADER_TAG` | The tag of the image to be used to scrape Arpege World data. | `latest` |
| `ARPEGE_EUROPE_LOADER_IMAGE` | The image to be used to scrape Arpege Europe data. | `localhost:5000/arpege-europe-loader` |
Expand Down

0 comments on commit fd1c5ac

Please sign in to comment.