diff --git a/{{cookiecutter.project_slug}}/.github/workflows/main.yml b/{{cookiecutter.project_slug}}/.github/workflows/main.yml index bb67d27d..adaa21b1 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/main.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/main.yml @@ -171,7 +171,7 @@ jobs: export LC_ALL=C.UTF-8 export LANG=C.UTF-8 pip install --upgrade pip - python -m pip install poetry==1.6.1 + python -m pip install poetry==1.8.3 poetry install --with dev,test,docs curl -fsSL https://deb.nodesource.com/setup_20.x | bash - apt-get install -y nodejs diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index a292ea7f..55bf5895 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -109,7 +109,7 @@ python_tests: - export LC_ALL=C.UTF-8 - export LANG=C.UTF-8 - pip install --upgrade pip - - python -m pip install poetry==1.6.1 + - python -m pip install poetry==1.8.3 - poetry config virtualenvs.in-project true - poetry install --with dev,test,docs - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - diff --git a/{{cookiecutter.project_slug}}/Dockerfile b/{{cookiecutter.project_slug}}/Dockerfile index 7f7e8fff..272c93e1 100644 --- a/{{cookiecutter.project_slug}}/Dockerfile +++ b/{{cookiecutter.project_slug}}/Dockerfile @@ -2,7 +2,7 @@ # use node:20-bookworm as the base image for building the frontend ################################################################################# -FROM node:20-bookworm as frontend-builder +FROM node:20-bookworm AS frontend-builder # A wildcard is used to ensure both package.json AND package-lock.json are copied # where available (npm@5+) @@ -16,7 +16,7 @@ RUN npm run build:prod # use python:3.12-slim-bookworm as the base image for production and development ################################################################################# -FROM python:3.12-slim-bookworm as production +FROM python:3.12-slim-bookworm AS production # Add user that will be used in the container RUN groupadd wagtail && \ @@ -68,7 +68,7 @@ USER wagtail # set up virtual environment & install python dependencies ARG DEVELOPMENT -ARG POETRY_VERSION=1.6.1 +ARG POETRY_VERSION=1.8.3 ENV VIRTUAL_ENV=/home/wagtail/venv \ DEVELOPMENT=${DEVELOPMENT} RUN python -m venv $VIRTUAL_ENV @@ -105,7 +105,7 @@ CMD gunicorn {{cookiecutter.project_slug}}.wsgi:application # The next steps won't be run in production ################################################################################# -FROM production as dev +FROM production AS dev # Swap user, so the following tasks can be run as root USER root