From e9ebd97d25231210f926ba8bbc14cdf29bcf8853 Mon Sep 17 00:00:00 2001 From: Erik Harding Date: Tue, 10 Sep 2024 15:29:48 +0200 Subject: [PATCH 1/5] Build v8.0.1 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 20221ed..2a76826 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: GREP_TIMEOUT: 360 strategy: matrix: - VERSION: [v7.4.0, v7.4.2] + VERSION: [v8.0.0] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From 0bd270242b5dc23a6f7052cfce6f7ed7b6597fbb Mon Sep 17 00:00:00 2001 From: Erik Harding Date: Tue, 10 Sep 2024 15:32:18 +0200 Subject: [PATCH 2/5] Build v8.0.1 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a76826..40df664 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: GREP_TIMEOUT: 360 strategy: matrix: - VERSION: [v8.0.0] + VERSION: [v8.0.1] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From aca75aa14f34153bea4354f5ce0a920b77261d10 Mon Sep 17 00:00:00 2001 From: Erik Harding Date: Tue, 10 Sep 2024 15:35:30 +0200 Subject: [PATCH 3/5] Remove poetry pin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a00818..8fcbd45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN echo "Downloading RapidPro ${RAPIDPRO_VERSION} from https://github.com/$RAPI tar -xf rapidpro.tar.gz --strip-components=1 && \ rm rapidpro.tar.gz -RUN pip install -U pip && pip install -U poetry==1.1.15 +RUN pip install -U pip && pip install -U poetry # Build Python virtualenv RUN python3 -m venv /venv From e81a3d8d922226868ac043d3e6b06390c46187f7 Mon Sep 17 00:00:00 2001 From: Erik Harding Date: Tue, 10 Sep 2024 15:40:32 +0200 Subject: [PATCH 4/5] update poetry commands --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fcbd45..31a2d94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,7 @@ ENV PATH="/venv/bin:$PATH" ENV VIRTUAL_ENV="/venv" # Install configuration related dependencies -RUN poetry remove codecov --dev -RUN /venv/bin/pip install --upgrade pip && poetry install --no-interaction --no-dev && poetry add \ +RUN /venv/bin/pip install --upgrade pip && poetry install --no-interaction --without dev && poetry add \ "django-getenv==1.3.2" \ "django-cache-url==3.2.3" \ "uwsgi==2.0.20" \ From 524211f0e7cb564c386e830ff61e25af631b5a48 Mon Sep 17 00:00:00 2001 From: Erik Harding Date: Tue, 10 Sep 2024 15:43:49 +0200 Subject: [PATCH 5/5] Update python to 3.10 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 31a2d94..a70e7e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/praekeltfoundation/python-base-nw:3.9-bullseye as builder +FROM ghcr.io/praekeltfoundation/python-base-nw:3.10-bullseye as builder ENV PIP_RETRIES=120 \ PIP_TIMEOUT=400 \ @@ -33,7 +33,7 @@ RUN /venv/bin/pip install --upgrade pip && poetry install --no-interaction --wit "whitenoise==5.3.0" \ "flower==1.0.0" -FROM ghcr.io/praekeltfoundation/python-base-nw:3.9-bullseye +FROM ghcr.io/praekeltfoundation/python-base-nw:3.10-bullseye ARG RAPIDPRO_VERSION ENV RAPIDPRO_VERSION=${RAPIDPRO_VERSION:-master}