Skip to content

Commit

Permalink
Merge branch '6.0.x' into jensens-py11
Browse files Browse the repository at this point in the history
  • Loading branch information
jensens authored Dec 6, 2022
2 parents 071925e + 634e16f commit ade5c45
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ FROM base as builder

ENV PIP_PARAMS=""
ENV PIP_VERSION=22.3.1
ENV PLONE_VERSION=6.0.0rc1
ENV EXTRA_PACKAGES="relstorage==3.4.5 psycopg2==2.9.3 python-ldap==3.4.0"
ENV PLONE_VERSION=6.0.0rc2
ENV EXTRA_PACKAGES="relstorage==3.5.0 psycopg2==2.9.5 python-ldap==3.4.3"

RUN <<EOT
apt-get update
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ These images are **not** Buildout based!

### Plone 6 (Next Plone Release)

`6.0.0rc1` [(6.0.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.0.0rc1/Dockerfile)
`6.0.0rc2` [(6.0.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.0.0rc2/Dockerfile)

### Plone 6 (Nightly build)

Expand Down

0 comments on commit ade5c45

Please sign in to comment.