Skip to content

Commit f6c92f0

Browse files
ericoffredvd
andauthored
Prepare 6.0.10 (#137)
* 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]>
1 parent 22eb917 commit f6c92f0

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These images are **not** Buildout based!
2727

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

3333
### Unsupported tags

skeleton/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ elif [[ "$1" == "create-site" ]]; then
156156
exec $sudo $VENVBIN/zconsole run etc/${CONF} /app/scripts/create_site.py
157157
elif [[ "$1" == "console" ]]; then
158158
exec $sudo $VENVBIN/zconsole debug etc/${CONF}
159+
elif [[ "$1" == "run" ]]; then
160+
exec $sudo $VENVBIN/zconsole run etc/${CONF} "${@:2}"
159161
else
160162
# Custom
161163
exec "$@"

test/tests/plone-relstorage/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PLONE_TEST_TRIES=10
1111
# Start Postgres
1212
zname="relstorage-container-$RANDOM-$RANDOM"
1313
zpull="$(docker pull postgres:9-alpine)"
14-
zid="$(docker run -d --name "$zname" -e POSTGRES_USER=plone -e POSTGRES_PASSWORD=plone -e POSTGRES_DB=plone postgres:9-alpine)"
14+
zid="$(docker run -d --name "$zname" -e POSTGRES_USER=plone -e POSTGRES_PASSWORD=plone -e POSTGRES_DB=plone postgres:14-alpine)"
1515

1616
# Start Plone as RelStorage Client
1717
pname="plone-container-$RANDOM-$RANDOM"

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.9
1+
6.0.10

0 commit comments

Comments
 (0)