Skip to content

Commit

Permalink
Prepare 6.0.10 (#137)
Browse files Browse the repository at this point in the history
* Add support to run scripts via docker-entrypoint.sh

* Prepare release 6.0.10

* Update README.md

* Update README.md , also the link to 6.0.10

Ahem.

* Update postgres used for testing

---------

Co-authored-by: Fred van Dijk <[email protected]>
  • Loading branch information
ericof and fredvd authored Feb 28, 2024
1 parent 22eb917 commit f6c92f0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ These images are **not** Buildout based!

| Plone Version | Tags | Dockerfile |
| --- | --- | --- |
| 6 | `6.0.9`, `6.0`, `6`, `latest` | [(6.0.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.0.9/Dockerfile)|
| 6 | `6.0.10`, `6.0`, `6`, `latest` | [(6.0.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.0.10/Dockerfile)|
| 6 (nightly) | `nightly` | [(Dockerfile.nightly)](https://github.com/plone/plone-backend/blob/6.0.x/Dockerfile.nightly) |

### Unsupported tags
Expand Down
2 changes: 2 additions & 0 deletions skeleton/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ elif [[ "$1" == "create-site" ]]; then
exec $sudo $VENVBIN/zconsole run etc/${CONF} /app/scripts/create_site.py
elif [[ "$1" == "console" ]]; then
exec $sudo $VENVBIN/zconsole debug etc/${CONF}
elif [[ "$1" == "run" ]]; then
exec $sudo $VENVBIN/zconsole run etc/${CONF} "${@:2}"
else
# Custom
exec "$@"
Expand Down
2 changes: 1 addition & 1 deletion test/tests/plone-relstorage/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PLONE_TEST_TRIES=10
# Start Postgres
zname="relstorage-container-$RANDOM-$RANDOM"
zpull="$(docker pull postgres:9-alpine)"
zid="$(docker run -d --name "$zname" -e POSTGRES_USER=plone -e POSTGRES_PASSWORD=plone -e POSTGRES_DB=plone postgres:9-alpine)"
zid="$(docker run -d --name "$zname" -e POSTGRES_USER=plone -e POSTGRES_PASSWORD=plone -e POSTGRES_DB=plone postgres:14-alpine)"

# Start Plone as RelStorage Client
pname="plone-container-$RANDOM-$RANDOM"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.9
6.0.10

0 comments on commit f6c92f0

Please sign in to comment.