-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fb_pip_using_pyproject_toml
- Loading branch information
Showing
22 changed files
with
323 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
.devcontainer | ||
.github | ||
.ropeproject | ||
.vscode | ||
build | ||
dist | ||
docker/alpine/var | ||
docker/elastic | ||
docker/solr | ||
docker/ubuntu/var | ||
docker/zeo/var | ||
docker/zope/var |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,38 @@ | ||
{ | ||
"version": "0.2.0", | ||
|
||
"configurations": [ | ||
{ | ||
"name": "ZMS5-DEV", | ||
"type": "python", | ||
"request": "launch", | ||
"program": "~/vpy38/bin/runwsgi", | ||
"program": "~/vpy313/bin/runwsgi", | ||
"justMyCode": false, | ||
"console": "integratedTerminal", | ||
"args": [ | ||
"--debug", | ||
"--verbose", | ||
"~/instance/zms5_dev/etc/zope.ini", | ||
"debug-mode=on", | ||
// "http_port=8086", | ||
"debug-mode=on" | ||
], | ||
"env": { | ||
"PYTHONUNBUFFERED":"1", | ||
"PYTHONUNBUFFERED": "1", | ||
"CONFIG_FILE": "~/instance/zms5_dev/etc/zope.ini", | ||
"INSTANCE_HOME": "~/instance/zms5_dev", | ||
"CLIENT_HOME": "~/instance/zms5_dev", | ||
"PYTHON": "~/vpy38/bin/python", | ||
"SOFTWARE_HOME": "~/vpy38/bin/" | ||
"PYTHON": "~/vpy313/bin/python", | ||
"SOFTWARE_HOME": "~/vpy313/bin/" | ||
}, | ||
"serverReadyAction":{ | ||
"pattern":"Serving on http://127.0.0.1:8081", | ||
"serverReadyAction": { | ||
"pattern": "Serving on http://127.0.0.1:8081", | ||
"uriFormat": "http://127.0.0.1:8081/manage_main", | ||
"action": "openExternally", | ||
}, | ||
"action": "openExternally" | ||
} | ||
}, | ||
|
||
|
||
|
||
{ | ||
"name": "Python Debugger: Python File", | ||
"type": "debugpy", | ||
"request": "launch", | ||
"program": "${file}" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#!/bin/sh | ||
|
||
exec docker compose run --rm zope \ | ||
watching_testrunner --basepath Products --basepath tests \ | ||
-- pytest --tb=short $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,56 @@ | ||
services: | ||
zope: | ||
build: ./docker/base | ||
image: zope:latest | ||
depends_on: | ||
- zeo | ||
stop_grace_period: 1s # SIGKILL after 1s, as zope is always taking the full 10 seconds | ||
ports: | ||
- 80:80 | ||
volumes: | ||
- .:/home/zope/venv/src/zms/ | ||
- ./docker/zope/etc/:/home/zope/etc/ | ||
- ./docker/zope/var/:/home/zope/var/ | ||
# To share external methods between Zope/ZEO/Docker clients folder needs to be mounted | ||
- ./docker/zope/Extensions/:/home/zope/Extensions/ | ||
# allow attaching to the container to debug with `breakpoint()` | ||
stdin_open: true | ||
tty: true | ||
zope: | ||
build: | ||
context: . | ||
dockerfile: ./docker/base/Dockerfile | ||
image: localhost/zms:latest | ||
depends_on: | ||
- zeo | ||
stop_grace_period: 1s # SIGKILL after 1s, as zope is always taking the full 10 seconds | ||
command: runwsgi --debug --verbose etc/zope.ini debug-mode=on http_port=80 | ||
ports: | ||
- 80:80 | ||
volumes: | ||
- ./docker/zope/etc/:/home/zope/etc/ | ||
- ./docker/zope/var/:/home/zope/var/ | ||
# To share external methods between Zope/ZEO/Docker clients folder needs to be mounted | ||
- ./docker/zope/Extensions/:/home/zope/Extensions/ | ||
# source code | ||
- ./tests:/home/zope/tests | ||
- ./test_output:/home/zope/test_output | ||
- ./selenium_tests:/home/zope/selenium_tests | ||
develop: | ||
watch: | ||
# sync+restart | ||
- action: sync+restart | ||
path: ./Products | ||
target: /home/zope/Products | ||
# rebuild | ||
- action: rebuild | ||
path: docker/base/Dockerfile | ||
- action: rebuild | ||
path: requirements.txt | ||
- action: rebuild | ||
path: requirements-zeo.txt | ||
- action: rebuild | ||
path: requirements-full.txt | ||
- action: rebuild | ||
path: requirements-dev.txt | ||
- action: rebuild | ||
path: setup.py | ||
- action: rebuild | ||
path: setup.cfg | ||
|
||
zeo: | ||
image: zope:latest | ||
command: runzeo --configure etc/zeo.conf | ||
volumes: | ||
- ./docker/zeo/etc/:/home/zope/etc/ | ||
- ./docker/zeo/var/:/home/zope/var/ | ||
# allow attaching to the container to debug with `breakpoint()` | ||
stdin_open: true | ||
tty: true | ||
|
||
zeo: | ||
build: | ||
context: . | ||
dockerfile: ./docker/base/Dockerfile | ||
image: localhost/zms:latest | ||
command: runzeo --configure etc/zeo.conf | ||
volumes: | ||
- ./docker/zeo/etc/:/home/zope/etc/ | ||
- ./docker/zeo/var/:/home/zope/var/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,13 @@ | ||
# Externalizing Extensions for Docker | ||
|
||
Hint: Mounting the folder ./Extensions keeps the external functions | ||
synchronous to all all ZEO clients and Docker containers. | ||
synchronous to all all ZEO clients and Docker containers. | ||
|
||
Hint: if the docker container cannot write to the ./Extensions or ./var folder, | ||
on a dev system you can simply set the permissions to 777. | ||
Important:this not recommended for production! | ||
|
||
```bash | ||
chmod -R 777 Extensions | ||
chmod -R 777 var | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.