Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deprecate flyingpigeon #376

Merged
merged 5 commits into from
Sep 13, 2023
Merged

deprecate flyingpigeon #376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aed99b6
deprecate flying pigeon
mishaschwartz Aug 24, 2023
81f59c5
Merge branch 'master' into deprecate-flyingpigeon
mishaschwartz Aug 29, 2023
d5b90b4
Merge branch 'master' into deprecate-flyingpigeon
fmigneault Sep 6, 2023
17c3b1f
Merge branch 'master' into deprecate-flyingpigeon
fmigneault Sep 12, 2023
e2a6d59
Bump version: 1.30.1 → 1.31.0
mishaschwartz Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
## Changes:

- Deprecate the `flyingpigeon` web processing service

[1.29.2](https://github.com/bird-house/birdhouse-deploy/tree/1.29.2) (2023-08-24)
------------------------------------------------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions birdhouse/config/flyingpigeon/config/canarie-api/docker-compose-extra.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions birdhouse/config/flyingpigeon/config/magpie/docker-compose-extra.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion birdhouse/default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export DEFAULT_CONF_DIRS='
./config/proxy
./config/canarie-api
./config/geoserver
./config/flyingpigeon
./config/finch
./config/raven
./config/hummingbird
Expand Down
0 birdhouse/config/flyingpigeon/.gitignore → ...ecated-components/flyingpigeon/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ie-api/canarie_api_monitoring.py.template → ...ie-api/canarie_api_monitoring.py.template
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: "3.4"
services:
proxy:
volumes:
- ./deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro
6 changes: 6 additions & 0 deletions birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: "3.4"
services:
magpie:
volumes:
- ./deprecated-components/flyingpigeon/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/flyingpigeon-providers.cfg:ro
- ./deprecated-components/flyingpigeon/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/flyingpigeon-permissions.cfg:ro
0 ...on/config/magpie/permissions.cfg.template → ...on/config/magpie/permissions.cfg.template
View file
Open in desktop
File renamed without changes.
0 ...geon/config/magpie/providers.cfg.template → ...geon/config/magpie/providers.cfg.template
View file
Open in desktop
File renamed without changes.
0 ...s_outputs-volume/docker-compose-extra.yml → ...s_outputs-volume/docker-compose-extra.yml
View file
Open in desktop
File renamed without changes.
0 birdhouse/config/flyingpigeon/default.env → ...cated-components/flyingpigeon/default.env
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...fig/flyingpigeon/docker-compose-extra.yml → ...nts/flyingpigeon/docker-compose-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
environment:
- PYWPS_CFG=/wps.cfg
volumes:
- ./config/flyingpigeon/wps.cfg:/wps.cfg
- ./deprecated-components/flyingpigeon/wps.cfg:/wps.cfg
- /tmp
depends_on:
- postgres
Expand Down
0 ...onfig/flyingpigeon/post-docker-compose-up → ...nents/flyingpigeon/post-docker-compose-up
View file
Open in desktop
File renamed without changes.
0 ...flyingpigeon/service-config.json.template → ...flyingpigeon/service-config.json.template
View file
Open in desktop
File renamed without changes.
0 ...ouse/config/flyingpigeon/wps.cfg.template → ...-components/flyingpigeon/wps.cfg.template
View file
Open in desktop
File renamed without changes.
9 changes: 2 additions & 7 deletions tests/test_read_configs_include.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ class TestReadConfigs:
"./config/proxy",
"./config/canarie-api",
"./config/geoserver",
"./config/postgres",
"./config/wps_outputs-volume",
"./config/flyingpigeon",
"./config/postgres",
"./config/finch",
"./config/raven",
"./config/data-volume",
Expand Down Expand Up @@ -177,13 +176,10 @@ class TestCreateComposeConfList:
"./config/geoserver/docker-compose-extra.yml",
"./config/geoserver/config/canarie-api/docker-compose-extra.yml",
"./config/geoserver/config/proxy/docker-compose-extra.yml",
"./config/postgres/docker-compose-extra.yml",
"./config/wps_outputs-volume/docker-compose-extra.yml",
"./config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml",
"./config/wps_outputs-volume/config/proxy/docker-compose-extra.yml",
"./config/flyingpigeon/docker-compose-extra.yml",
"./config/flyingpigeon/config/canarie-api/docker-compose-extra.yml",
"./config/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml",
"./config/postgres/docker-compose-extra.yml",
"./config/finch/docker-compose-extra.yml",
"./config/finch/config/canarie-api/docker-compose-extra.yml",
"./config/finch/config/wps_outputs-volume/docker-compose-extra.yml",
Expand All @@ -202,7 +198,6 @@ class TestCreateComposeConfList:
"./config/portainer/config/proxy/docker-compose-extra.yml",
"./config/magpie/docker-compose-extra.yml",
"./config/geoserver/config/magpie/docker-compose-extra.yml",
"./config/flyingpigeon/config/magpie/docker-compose-extra.yml",
"./config/finch/config/magpie/docker-compose-extra.yml",
"./config/raven/config/magpie/docker-compose-extra.yml",
"./config/hummingbird/config/magpie/docker-compose-extra.yml",
Expand Down
Loading