From 3fe6df88ac99f84669456c5fac06c844e1fd9a1f Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Tue, 7 May 2024 14:59:55 +0200 Subject: [PATCH 1/2] Update docker-compose.dev.yml to use dynamic service name for dependency --- docker-compose.dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 366a5e87..7635a30d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -66,7 +66,7 @@ services: max-size: "100m" max-file: "10" depends_on: - - ckan-dev + - ${CKAN_DEV_COMPOSE_SERVICE} ports: - "0.0.0.0:${PYCSW_PORT_HOST}:${PYCSW_PORT}" volumes: From cf8db6dc3930ce0fd3044e0213a1b34b3149087b Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Fri, 17 May 2024 13:28:00 +0000 Subject: [PATCH 2/2] Update ckanext-schemingdcat --- ckan/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index a84f69f1..8c8681a6 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -22,7 +22,7 @@ COPY req_fixes req_fixes ## Pages - v0.5.2 ## ## PDFView - 0.0.8 ## ## Fluent - v1.0.1 (mjanez/Forked stable version) ## -## Scheming DCAT - v3.0.0 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ## +## Scheming DCAT - v3.1.0 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ## RUN echo ${TZ} > /etc/timezone && \ if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime; fi && \ # Remove apk cache @@ -54,7 +54,7 @@ RUN echo ${TZ} > /etc/timezone && \ echo "mjanez/ckanext-fluent" && \ pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-fluent.git@v1.0.1#egg=ckanext-fluent && \ echo "mjanez/ckanext-schemingdcat" && \ - pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v3.0.0#egg=ckanext_schemingdcat && \ + pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v3.1.0#egg=ckanext_schemingdcat && \ pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-schemingdcat/requirements.txt # Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc