Skip to content

Commit 137499b

Browse files
committed
Clean up rc2 tests: set back to rc1, revert hardcoded rc1 that fetches constraints.
Remove version nmber from PLONE_VERSION ARG in Docker files so that the build will fall. This will re-introduce output warnings from docker buildx that possible uninitialised variables are used.
1 parent 298975b commit 137499b

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=3.12
3-
ARG PLONE_VERSION=6.1.0rc2
3+
ARG PLONE_VERSION
44
FROM plone/server-builder:${PLONE_VERSION} AS builder
55

66
ARG PLONE_VERSION

Dockerfile.acceptance

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=3.12
3-
ARG PLONE_VERSION=6.1.0rc2
3+
ARG PLONE_VERSION
44
FROM plone/server-builder:${PLONE_VERSION} AS builder
55

66
ARG PLONE_VERSION

Dockerfile.builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARG PYTHON_VERSION=3.12
33
FROM python:${PYTHON_VERSION}-slim-bookworm
44

5-
ARG PLONE_VERSION=6.1.0rc2
5+
ARG PLONE_VERSION
66

77
ENV EXTRA_PACKAGES="relstorage==4.1.1 psycopg2==2.9.10 python-ldap==3.4.4 ZEO"
88

@@ -32,7 +32,7 @@ RUN <<EOT
3232
apt-get install -y --no-install-recommends $buildDeps
3333
busybox --install -s
3434
python -m venv /app
35-
curl -L -o /app/constraints.txt https://dist.plone.org/release/6.1.0rc1/constraints.txt
35+
curl -L -o /app/constraints.txt https://dist.plone.org/release/$PLONE_VERSION/constraints.txt
3636
/app/bin/pip install -U pip wheel setuptools -c /app/constraints.txt
3737
/app/bin/pip install Plone ${EXTRA_PACKAGES} -c /app/constraints.txt
3838
bash -c 'mkdir -p /data/{filestorage,blobstorage,cache,logs}'

Dockerfile.classicui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=3.12
3-
ARG PLONE_VERSION=6.1.0rc2
3+
ARG PLONE_VERSION
44
FROM plone/server-builder:${PLONE_VERSION} AS builder
55

66
ARG PLONE_VERSION

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=3.12
3-
ARG PLONE_VERSION=6.1.0rc2
3+
ARG PLONE_VERSION
44
FROM plone/server-builder:${PLONE_VERSION}
55

66
ARG PYTHON_VERSION

Dockerfile.prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG PYTHON_VERSION=3.12
3-
ARG PLONE_VERSION=6.1.0rc2
3+
ARG PLONE_VERSION
44
FROM python:${PYTHON_VERSION}-slim-bookworm
55

66
ARG PYTHON_VERSION

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.0rc2
1+
6.1.0rc1

0 commit comments

Comments
 (0)