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.

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

fix mongodb network #205

Merged
merged 2 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.17.0
current_version = 1.17.1
commit = True
tag = False
tag_name = {new_version}
Expand Down
48 changes: 28 additions & 20 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,44 @@

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

[1.17.1](https:/bird-house/birdhouse-deploy/tree/1.17.1) (2021-11-02)
------------------------------------------------------------------------------------------------------------------

## Fixes

- Apply ``mongodb`` network to ``mongodb`` image in order to allow ``phoenix`` to properly reference it.
- Remove ``mongodb`` definition from ``./components/weaver`` since the extended ``mongodb`` network is already provided.

[1.17.0](https:/bird-house/birdhouse-deploy/tree/1.17.0) (2021-11-01)
------------------------------------------------------------------------------------------------------------------

### Changes
## Changes

- Adds [Weaver](https:/crim-ca/weaver) to the stack (optional) when ``./components/weaver``
is added to ``EXTRA_CONF_DIRS``. For more details, refer to
[Weaver Component](https:/bird-house/birdhouse-deploy/blob/master/birdhouse/components/README.rst#Weaver)
Following happens when enabled:
- Adds [Weaver](https:/crim-ca/weaver) to the stack (optional) when ``./components/weaver``
is added to ``EXTRA_CONF_DIRS``. For more details, refer to
[Weaver Component](https:/bird-house/birdhouse-deploy/blob/master/birdhouse/components/README.rst#Weaver)
Following happens when enabled:

* Service ``weaver`` (API) gets added with endpoints ``/twitcher/ows/proxy/weaver`` and ``/weaver``.
* Service ``weaver`` (API) gets added with endpoints ``/twitcher/ows/proxy/weaver`` and ``/weaver``.

* All *birds* offering a WPS 1.x/2.x endpoint are automatically added as providers known by `Weaver`
(birds: ``catalog``, ``finch``, ``flyingpigeon``, ``hummingbird``, ``malleefowl`` and ``raven``).
This offers an automatic mapping of WPS 1.x/2.x requests of process descriptions and execution nested under
the *birds* to corresponding [OGC-API - Processes](https:/opengeospatial/ogcapi-processes/)
RESTful interface (and added functionalities).
* All *birds* offering a WPS 1.x/2.x endpoint are automatically added as providers known by `Weaver`
(birds: ``catalog``, ``finch``, ``flyingpigeon``, ``hummingbird``, ``malleefowl`` and ``raven``).
This offers an automatic mapping of WPS 1.x/2.x requests of process descriptions and execution nested under
the *birds* to corresponding [OGC-API - Processes](https:/opengeospatial/ogcapi-processes/)
RESTful interface (and added functionalities).

* New processes can be deployed and executed using
Dockerized [Application Packages](https://pavics-weaver.readthedocs.io/en/latest/package.html).
Additionally, all existing processes (across *bird* providers and Dockerized Application Packages)
can be chained into [Workflows](https://pavics-weaver.readthedocs.io/en/latest/processes.html#workflow)
* New processes can be deployed and executed using
Dockerized [Application Packages](https://pavics-weaver.readthedocs.io/en/latest/package.html).
Additionally, all existing processes (across *bird* providers and Dockerized Application Packages)
can be chained into [Workflows](https://pavics-weaver.readthedocs.io/en/latest/processes.html#workflow)

* Images ``weaver-worker`` (`Weaver`'s job executor) and ``docker-proxy`` (sibling Docker container dispatcher)
are added to the stack to support above functionalities.
* Images ``weaver-worker`` (`Weaver`'s job executor) and ``docker-proxy`` (sibling Docker container dispatcher)
are added to the stack to support above functionalities.

* Adds `Magpie` permissions and service for `Weaver` endpoints.
* Adds `Magpie` permissions and service for `Weaver` endpoints.

* Adds ``./optional-components/test-weaver`` for even more `Magpie` extended permissions for `Weaver`
for getting access to resources for functionalities required by [Weaver Testing notebook][weaver-test-notebook].
* Adds ``./optional-components/test-weaver`` for even more `Magpie` extended permissions for `Weaver`
for getting access to resources for functionalities required by [Weaver Testing notebook][weaver-test-notebook].

[weaver-test-notebook]: https:/Ouranosinc/pavics-sdi/blob/master/docs/source/notebook-components/weaver_example.ipynb

Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ for a full-fledged production platform.
* - releases
- | |latest-version| |commits-since|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.17.0.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.17.1.svg
:alt: Commits since latest release
:target: https:/bird-house/birdhouse-deploy/compare/1.17.0...master
:target: https:/bird-house/birdhouse-deploy/compare/1.17.1...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.17.0-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.17.1-blue.svg?style=flat
:alt: Latest Tag
:target: https:/bird-house/birdhouse-deploy/tree/1.17.0
:target: https:/bird-house/birdhouse-deploy/tree/1.17.1

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
9 changes: 1 addition & 8 deletions birdhouse/components/weaver/docker-compose-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ services:
- ./components/weaver/config/magpie/config.yml:/opt/local/src/magpie/config/permissions/weaver-permissions.cfg:ro
- ./components/weaver/config/magpie/config.yml:/opt/local/src/magpie/config/providers/weaver-provider.cfg:ro

mongodb:
# extend MongoDB to use a shared network that Weaver will be able to access directly
# do this as we assume that 'ports' are not exposed, meaning that the DB should be accessible only from that network
# also limits external access from other images such as docker container from dispatched execution by workers
networks:
- mongodb
# don't provide volumes, assume that if data persistence was requested, it should be added via another extra compose

# Image 'weaver' is the API side of the application
weaver:
container_name: ${WEAVER_MANAGER_NAME}
Expand Down Expand Up @@ -81,6 +73,7 @@ services:
#env_file:
# - ./config/mongodb/credentials.env
depends_on:
# no 'default' network here such that the worker is not accessible from proxy/http
- mongodb
- weaver # if not started first, sometimes celery misbehaves and will not pick jobs in queue
- docker-proxy
Expand Down
2 changes: 2 additions & 0 deletions birdhouse/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,8 @@ services:
mongodb:
image: mongo:3.4.0
container_name: mongodb
networks:
- mongodb
volumes:
- ${DATA_PERSIST_ROOT}/mongodb_persist:/data/db
# Mongodb crash with permission denied errors if the command is not overridden like this
Expand Down