Skip to content

Commit

Permalink
Merge branch 'master' into fix-cwl-enum-schema-name
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault authored Sep 22, 2023
2 parents 1709e8e + f0abcd1 commit 55af1bc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# configuration to setup readthedocs
version: 2
build:
os: ubuntu-22.04
tools:
python: "3.10"
sphinx:
configuration: docs/source/conf.py
#formats: all
formats:
- htmlzip
python:
version: "3.8"
install:
- requirements: requirements-sys.txt
- requirements: requirements-doc.txt
15 changes: 8 additions & 7 deletions docker/docker-compose.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ services:
- mongodb
volumes:
# Weaver configuration
- ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini
- ./components/weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml
- ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml
- ./components/weaver/config/weaver/wps_processes.yml:/opt/local/src/weaver/config/wps_processes.yml
- ./config/weaver.ini.example:/opt/local/src/weaver/config/weaver.ini
- ./config/data_sources.yml.example:/opt/local/src/weaver/config/data_sources.yml
- ./config/request_options.yml.example:/opt/local/src/weaver/config/request_options.yml
- ./config/wps_processes.yml.example:/opt/local/src/weaver/config/wps_processes.yml
# WARNING: see detail in 'worker' definition
- /tmp/weaver/wps-outputs:/tmp/weaver/wps-outputs
networks:
Expand Down Expand Up @@ -57,9 +57,10 @@ services:
- mongodb
volumes:
# Weaver configuration
- ./config/weaver.ini:/opt/local/src/weaver/config/weaver.ini
- ./config/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml
- ./config/request_options.yml:/opt/local/src/weaver/config/request_options.yml
- ./config/weaver.ini.example:/opt/local/src/weaver/config/weaver.ini
- ./config/data_sources.yml.example:/opt/local/src/weaver/config/data_sources.yml
- ./config/request_options.yml.example:/opt/local/src/weaver/config/request_options.yml
- ./config/wps_processes.yml.example:/opt/local/src/weaver/config/wps_processes.yml
# WARNING:
# If you need to provide some credentials to provide access to protected docker repositories
- ~/.docker/config.json:/root/.docker/config.json
Expand Down

0 comments on commit 55af1bc

Please sign in to comment.