Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use uv #147

Open
wants to merge 1 commit into
base: 6.0.x
Choose a base branch
from
Open

use uv #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.acceptance
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM plone/server-builder:${PLONE_VERSION} as builder
ENV _PIP_USE_IMPORTLIB_METADATA=0

# Install robotframework support
RUN /app/bin/pip install plone.app.robotframework>=2.0.0
RUN /app/bin/uv pip install plone.app.robotframework>=2.0.0

FROM plone/server-prod-config:${PLONE_VERSION}

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ RUN <<EOT
apt-get install -y --no-install-recommends $buildDeps
busybox --install -s
python -m venv /app
export VIRTUAL_ENV=/app
curl -L -o /app/constraints.txt https://dist.plone.org/release/$PLONE_VERSION/constraints.txt
/app/bin/pip install -U pip wheel setuptools -c /app/constraints.txt
/app/bin/pip install Plone ${EXTRA_PACKAGES} -c /app/constraints.txt
/app/bin/pip install -U uv pip wheel setuptools -c /app/constraints.txt
/app/bin/uv pip install Plone ${EXTRA_PACKAGES} -c /app/constraints.txt
bash -c 'mkdir -p /data/{filestorage,blobstorage,cache,logs}'
/app/bin/python /compile_mo.py
find /app \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' +
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.classicui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG PLONE_VERSION
FROM plone/server-builder:${PLONE_VERSION} as builder

# Remove Volto support from builder image
RUN /app/bin/pip uninstall -y plone.volto
RUN /app/bin/uv pip uninstall -y plone.volto

FROM plone/server-prod-config:${PLONE_VERSION}

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ LABEL maintainer="Plone Community <[email protected]>" \
# Install plone.reload, create plone user
RUN <<EOT
set -e
/app/bin/pip install plone.reload -c /app/constraints.txt
export VIRTUAL_ENV=/app
/app/bin/uv pip install plone.reload -c /app/constraints.txt
useradd --system -m -d /app -U -u 500 plone
chown -R 500:500 /data /app
ln -s /data /app/var
Expand Down
4 changes: 2 additions & 2 deletions skeleton/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if [[ -n "${ADDONS}" ]]; then
echo "THIS IS NOT MEANT TO BE USED IN PRODUCTION"
echo "Read about it: https://6.docs.plone.org/install/containers/images/backend.html"
echo "======================================================================================="
$VENVBIN/pip install ${ADDONS} ${PIP_PARAMS}
$VENVBIN/uv pip install ${ADDONS} ${PIP_PARAMS}
fi

# Handle development addons
Expand All @@ -122,7 +122,7 @@ if [[ -v DEVELOP ]]; then
PACKAGES+=" --editable ${a}"
done
done <<< "$DEVELOP"
$VENVBIN/pip install ${PACKAGES} ${PIP_PARAMS}
$VENVBIN/uv pip install ${PACKAGES} ${PIP_PARAMS}
fi

if [[ "$1" == "start" ]]; then
Expand Down
Loading