From 516ec09fd86b383b5ddad7e7f89c468cf48fe17a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Dec 2024 12:03:20 +0000 Subject: [PATCH 1/4] chore(deps): update docker.io/ckan/ckan-base docker tag to v2.10.6 --- ckan/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 4e492ac8..1a538a8c 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-base:2.10.5 +FROM docker.io/ckan/ckan-base:2.10.6 RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-gdi-userportal.git@v1.3.8#egg=ckanext-gdi-userportal && \ pip3 install -r ${APP_DIR}/src/ckanext-gdi-userportal/requirements.txt From 05c35a55dc04dea6ad110f3570412c68554c83f8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Dec 2024 12:03:22 +0000 Subject: [PATCH 2/4] chore(deps): update docker.io/ckan/ckan-dev docker tag to v2.10.6 --- ckan/Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 859b4f7c..35619fc8 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-dev:2.10.5 +FROM docker.io/ckan/ckan-dev:2.10.6 RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v2.1.0#egg=ckanext-dcat && \ pip3 install -r ${APP_DIR}/src/ckanext-dcat/requirements.txt From be2c5a8ec3156a4f27951034d10ff878fbbbfc15 Mon Sep 17 00:00:00 2001 From: Bruno Pacheco Date: Mon, 16 Dec 2024 21:04:59 +0100 Subject: [PATCH 3/4] chore(deps): revert CKAN upgrade --- ckan/Dockerfile | 2 +- ckan/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 1a538a8c..4e492ac8 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-base:2.10.6 +FROM docker.io/ckan/ckan-base:2.10.5 RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-gdi-userportal.git@v1.3.8#egg=ckanext-gdi-userportal && \ pip3 install -r ${APP_DIR}/src/ckanext-gdi-userportal/requirements.txt diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 35619fc8..859b4f7c 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-dev:2.10.6 +FROM docker.io/ckan/ckan-dev:2.10.5 RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v2.1.0#egg=ckanext-dcat && \ pip3 install -r ${APP_DIR}/src/ckanext-dcat/requirements.txt From 34713e6a0fb4621eb7ba15ec6dec92cd860ade5f Mon Sep 17 00:00:00 2001 From: Bruno Pacheco Date: Wed, 18 Dec 2024 11:52:30 +0100 Subject: [PATCH 4/4] chore(deps): upgrade CKAN to 2.10.6 --- ckan/Dockerfile | 2 +- ckan/Dockerfile.dev | 2 +- docker-compose.yml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 4e492ac8..1a538a8c 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-base:2.10.5 +FROM docker.io/ckan/ckan-base:2.10.6 RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-gdi-userportal.git@v1.3.8#egg=ckanext-gdi-userportal && \ pip3 install -r ${APP_DIR}/src/ckanext-gdi-userportal/requirements.txt diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 859b4f7c..35619fc8 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -FROM docker.io/ckan/ckan-dev:2.10.5 +FROM docker.io/ckan/ckan-dev:2.10.6 RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v2.1.0#egg=ckanext-dcat && \ pip3 install -r ${APP_DIR}/src/ckanext-dcat/requirements.txt diff --git a/docker-compose.yml b/docker-compose.yml index 5862c603..c95b206e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ volumes: ckan_storage: pg_data: solr_data: - pip_cache: site_packages: services: @@ -29,7 +28,6 @@ services: volumes: - ckan_storage:/var/lib/ckan - ./src:/srv/app/src_extensions - - pip_cache:/root/.cache/pip - site_packages:/usr/lib/python3.10/site-packages restart: unless-stopped healthcheck: