Skip to content

Commit c89e82c

Browse files
committed
Introduce PLONE_BACKEND_MINOR_VERSION for docker
1 parent fe76f66 commit c89e82c

File tree

9 files changed

+80
-79
lines changed

9 files changed

+80
-79
lines changed

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ def source_replace(app, docname, source):
295295

296296
# Dict of replacements.
297297
source_replacements = {
298-
"{PLONE_BACKEND_VERSION}": "6.0",
298+
"{PLONE_BACKEND_MINOR_VERSION}": "6.0",
299+
"{PLONE_BACKEND_VERSION}": "6.0.1",
299300
}
300301

301302

docs/install/containers/examples/haproxy-plone-zeo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
LOG_LEVEL: "info"
4141

4242
backend:
43-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
43+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
4444
restart: always
4545
environment:
4646
ZEO_ADDRESS: zeo:8100

docs/install/containers/examples/nginx-plone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ services:
7676
- "80:80"
7777

7878
backend:
79-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
79+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
8080
environment:
8181
SITE: Plone
8282
TYPE: classic

docs/install/containers/examples/nginx-volto-plone-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ services:
106106
- backend
107107

108108
backend:
109-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
109+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
110110
environment:
111111
SITE: Plone
112112
RELSTORAGE_DSN: "dbname='plone' user='plone' host='db' password='plone'"

docs/install/containers/examples/nginx-volto-plone-zeo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ services:
106106
- backend
107107

108108
backend:
109-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
109+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
110110
environment:
111111
SITE: Plone
112112
ZEO_ADDRESS: db:8100

docs/install/containers/examples/nginx-volto-plone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ services:
104104
- backend
105105

106106
backend:
107-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
107+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
108108
environment:
109109
SITE: Plone
110110
volumes:

docs/install/containers/images/backend.md

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

docs/install/containers/images/frontend.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ This image is **not a base image** to be extended in your projects, but an examp
2121
### Main variables
2222

2323

24-
| Environment variable | Description | Example |
25-
| --- | --- | --- |
26-
| `RAZZLE_API_PATH` | Used to generate frontend calls to the backend. Needs to be a public URL accessible by client browser. | `http://api.site.org/++api++/` |
27-
| `RAZZLE_INTERNAL_API_PATH` | Used by the middleware to construct requests to the backend. It can be a non-public address. | `http://backend:8080/Plone` |
28-
| `VOLTO_ROBOTSTXT` | Override the `robots.txt` file. | `"User-agent: *\nDisallow: "` |
24+
| Environment variable | Description | Example |
25+
| -------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------ |
26+
| `RAZZLE_API_PATH` | Used to generate frontend calls to the backend. Needs to be a public URL accessible by client browser. | `http://api.site.org/++api++/` |
27+
| `RAZZLE_INTERNAL_API_PATH` | Used by the middleware to construct requests to the backend. It can be a non-public address. | `http://backend:8080/Plone` |
28+
| `VOLTO_ROBOTSTXT` | Override the `robots.txt` file. | `"User-agent: *\nDisallow: "` |
2929

3030
```{note}
3131
For an extensive list of environment variables used by the frontend, visit {doc}`/volto/configuration/environmentvariables`.
@@ -100,7 +100,7 @@ version: "3"
100100
services:
101101

102102
backend:
103-
image: plone/plone-backend:{PLONE_BACKEND_VERSION}
103+
image: plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
104104
# Plone 5.2 series can be used too
105105
# image: plone/plone-backend:5.2.7
106106
ports:

docs/install/containers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Consult [Get Docker](https://docs.docker.com/get-docker/) for details.
5959
First start the Plone Backend, naming it `plone6-backend` and creating a site with its default configuration, using the following command.
6060

6161
```shell
62-
docker run --name plone6-backend -e SITE=Plone -e CORS_ALLOW_ORIGIN='*' -d -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_VERSION}
62+
docker run --name plone6-backend -e SITE=Plone -e CORS_ALLOW_ORIGIN='*' -d -p 8080:8080 plone/plone-backend:{PLONE_BACKEND_MINOR_VERSION}
6363
```
6464

6565
Now start the Plone Frontend, linking it to the `plone6-backend`:

0 commit comments

Comments
 (0)