-
Notifications
You must be signed in to change notification settings - Fork 34
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
Share common docker-compose.yml
configurations (PROD and DEV enviroments)
#79
base: dev
Are you sure you want to change the base?
Conversation
- remove `docker-compose-consumer.yml` - add `G3WSUITE_RUN_HUEY` enviroment variable within `.env.example` (batch processing) - add `g3w-suite-consumer` within `docker-compose.yml` - refactor `docker-compose-consumer-dev.yml` in order to extend the base `docker-compose.yml` - remove `scripts/docker-entrypoint-dev.sh` - add support for `gunicorn.conf.py` within `scripts/docker-entrypoint.sh` (in order to share same server in various enviroments: PROD / DEV) - refactor `scripts/docker-consumer-entrypoint.sh` (ref. `G3WSUITE_RUN_HUEY`) - update `README.md` instructions related to batch processing usage - update `docker-compose.yml` version from `v3` to `v3.4`
docker-compose.yml
configurations (PROD / DEV)docker-compose.yml
configurations (PROD and DEV enviroments)
workers = os.getenv('G3WSUITE_GUNICORN_NUM_WORKERS', 8) | ||
max_requests = os.getenv('G3WSUITE_GUNICORN_MAX_REQUESTS', 200) | ||
bind = '0.0.0.0:8000' | ||
reload = False if os.getenv('G3WSUITE_DEBUG', 'False') == 'False' else True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- FRONTEND | ||
- G3WSUITE_GUNICORN_MAX_REQUESTS | ||
- G3WSUITE_GUNICORN_NUM_WORKERS | ||
- G3WSUITE_GUNICORN_TIMEOUT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if the huey service requires setting a different / greater value for the timeout (ref: G3WSUITE_GUNICORN_TIMEOUT
).
G3W-SUITE use `huey` for bach processing (https://github.com/coleifer/huey), so if you want to use it, | ||
use `docker-compose-consumer.yml` file on deploy: | ||
G3W-SUITE use `huey` for batch processing (https://github.com/coleifer/huey), so if you want to use it, | ||
set `G3WSUITE_RUN_HUEY=True` enviroment variable and then deploy as usual: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rewrite this in a better English
…ose.yml` Related to: #75 (comment)
@@ -1,19 +1,22 @@ | |||
#!/bin/bash | |||
# Entrypoint script fro deploy production | |||
# Entrypoint script for deploy production | |||
# --------------------------------------- | |||
|
|||
# Start XVfb | |||
if [[ -f /tmp/.X99-lock ]]; then | |||
rm /tmp/.X99-lock | |||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't the docker container stateless? (why we are trying to remove the /tmp/.X99-lock
file from a previous run / reboot?)
See also: g3w-suite-docker/cmd.sh (commit history)
- G3WSUITE_TILECACHE_PATH | ||
- BITBUCKET_TOKEN | ||
- G3WSUITE_DEBUG=${G3WSUITE_DEBUG:-True} | ||
- G3WSUITE_GUNICORN_NUM_WORKERS=${G3WSUITE_GUNICORN_NUM_WORKERS:-1} | ||
- G3WSUITE_QDJANGO_SERVER_URL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if the G3WSUITE_QDJANGO_SERVER_URL
variable is still in use nowadays, currently it doesn't seem to have any production purpose (just forgotten to delete that also inside the docker-compose-dev.yml
?)
…ProjectsRegistry~createProject(projectConfig)` Start addressing: #67 As a result of: #150 we intend to bring the development environment ever closer to the production one. Related to: #89, #292 and g3w-suite/g3w-suite-docker#79
List of changes:
docker-compose-consumer.yml
.env.example
(G3WSUITE_RUN_HUEY
) in order to enable batch processingdocker-compose.yml
(g3w-suite-consumer
)scripts/docker-entrypoint-dev.sh
docker-compose-consumer-dev.yml
in order to extend the basedocker-compose.yml
scripts/docker-entrypoint.sh
in order to supportgunicorn.conf.py
configuration file (PROD and DEV server)scripts/docker-consumer-entrypoint.sh
(ref.G3WSUITE_RUN_HUEY
)README.md
instructions related to batch processing usageREADME_DEV.md
instructions related to development usagedocker-compose.yml
version fromv3
tov3.4
docker-compose-dev.yml
version fromv3
tov3.4
DISPLAY
andQGIS_SERVER_PARALLEL_RENDERING
environment variables definitions fromscripts/docker-entrypoint.sh
todocker-compose.yml
Closes: #66