From 4722b5e2fc46e902bdd8abeb2e76d40c6cea9551 Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Tue, 8 Oct 2024 06:17:20 +0000 Subject: [PATCH] update pythesint version in Docker image & CI --- .github/workflows/ci.yml | 1 + Dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec3848..221aae2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: BASE_IMAGE: "${{ vars.DOCKER_ORG }}/geospaas:2.5.2-python${{ matrix.python_version }}" IMAGE_NAME: "${{ vars.DOCKER_ORG }}/geospaas_harvesting" METANORM_VERSION: '4.2.2' + PYTHESINT_VERSION: 1.7.0.dev0 GEOSPAAS_DB_HOST: 'db' GEOSPAAS_DB_USER: 'test' GEOSPAAS_DB_PASSWORD: "${{ secrets.GEOSPAAS_DB_PASSWORD }}" diff --git a/Dockerfile b/Dockerfile index ac79c5c..bbd4b12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=nansencenter/geospaas:latest -FROM ${BASE_IMAGE} as base +FROM ${BASE_IMAGE} AS base ARG METANORM_VERSION RUN pip install --upgrade --no-cache-dir \ @@ -11,6 +11,9 @@ RUN pip install --upgrade --no-cache-dir \ 'requests_oauthlib==1.3.*' \ 'tblib' +ARG PYTHESINT_VERSION='' +RUN bash -c "[ -n '$PYTHESINT_VERSION' ] && pip install --upgrade 'pythesint==$PYTHESINT_VERSION'" + FROM base COPY . /tmp/setup