diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec3848..3ba76de 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 }}" @@ -56,6 +57,7 @@ jobs: build-args: | BASE_IMAGE=${{ env.BASE_IMAGE }} METANORM_VERSION=${{ env.METANORM_VERSION }} + PYTHESINT_VERSION=${{ env.PYTHESINT_VERSION }} push: false load: true tags: 'harvesting_tests' @@ -107,6 +109,7 @@ jobs: build-args: | BASE_IMAGE=${{ env.BASE_IMAGE }} METANORM_VERSION=${{ env.METANORM_VERSION }} + PYTHESINT_VERSION=${{ env.PYTHESINT_VERSION }} push: ${{ github.event_name == 'release' }} tags: | ${{ env.IMAGE_NAME }}:${{ github.ref_name }}-python${{ matrix.python_version }} diff --git a/Dockerfile b/Dockerfile index ac79c5c..cbd4c7b 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' || true" + FROM base COPY . /tmp/setup