From f6c92f0f96450de524e396b2600f1a9d078958cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Andrei?= <ericof@gmail.com>
Date: Wed, 28 Feb 2024 10:32:37 -0300
Subject: [PATCH] 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 <fredvd@gmail.com>
---
 README.md                          | 2 +-
 skeleton/docker-entrypoint.sh      | 2 ++
 test/tests/plone-relstorage/run.sh | 2 +-
 version.txt                        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d4c38c5..0289967 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/skeleton/docker-entrypoint.sh b/skeleton/docker-entrypoint.sh
index eadfdca..eff18f1 100755
--- a/skeleton/docker-entrypoint.sh
+++ b/skeleton/docker-entrypoint.sh
@@ -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 "$@"
diff --git a/test/tests/plone-relstorage/run.sh b/test/tests/plone-relstorage/run.sh
index 0f1a047..0905e70 100755
--- a/test/tests/plone-relstorage/run.sh
+++ b/test/tests/plone-relstorage/run.sh
@@ -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"
diff --git a/version.txt b/version.txt
index fb06ed7..c5a1e4c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-6.0.9
\ No newline at end of file
+6.0.10
\ No newline at end of file