Update Dockerfiles/docker-compose files

mjanez · Sep 12, 2023 · ce39a78 · ce39a78
1 parent 563cf7a
commit ce39a78
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/ckan-ogc/Dockerfile b/ckan-ogc/Dockerfile
@@ -28,6 +28,5 @@ RUN pdm install --no-self --group prod
 COPY ckan-ogc/conf/config.yaml.template config.yaml
 COPY ckan-ogc/docker-entrypoint.d/entrypoint.sh entrypoint.sh
 COPY ogc2ckan ogc2ckan
-COPY data data
 
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
diff --git a/ckan-ogc/Dockerfile.dev b/ckan-ogc/Dockerfile.dev
@@ -27,8 +27,6 @@ RUN pdm install --no-self --group prod
 
 COPY ckan-ogc/conf/config.yaml.template config.yaml
 COPY ckan-ogc/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
-COPY ogc2ckan ogc2ckan
-COPY data data
 
 EXPOSE 5678/TCP
 

diff --git a/ckan-ogc/Dockerfile.ghcr b/ckan-ogc/Dockerfile.ghcr
@@ -14,13 +14,8 @@ ENV TIMEOUT=300
 ENV SSL_UNVERIFIED_MODE=False
 
 WORKDIR ${APP_DIR}
-COPY pyproject.toml pdm.lock .
-
-RUN pdm install --no-self --group prod
 
 COPY ckan-ogc/conf/config.yaml.template config.yaml
 COPY ckan-ogc/docker-entrypoint.d/entrypoint.sh entrypoint.sh
-COPY ogc2ckan ogc2ckan
-COPY data data
 
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
diff --git a/ckan-ogc/Dockerfile.ghcr.dev b/ckan-ogc/Dockerfile.ghcr.dev
@@ -14,14 +14,9 @@ ENV TIMEOUT=300
 ENV SSL_UNVERIFIED_MODE=False
 
 WORKDIR ${APP_DIR}
-COPY pyproject.toml pdm.lock .
-
-RUN pdm install --no-self --group prod
 
 COPY ckan-ogc/conf/config.yaml.template config.yaml
 COPY ckan-ogc/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
-COPY ogc2ckan ogc2ckan
-COPY data data
 
 EXPOSE 5678/TCP
 

diff --git a/docker-compose.ghcr.dev.yml b/docker-compose.ghcr.dev.yml
@@ -19,4 +19,6 @@ services:
     volumes:
         - ./log:${APP_DIR}/log
         - ./metadata:${APP_DIR}/metadata
+        - ./data:${APP_DIR}/data
+        - ./ogc2ckan:${APP_DIR}/ogc2ckan
     network_mode: host
diff --git a/docker-compose.ghcr.yml b/docker-compose.ghcr.yml
@@ -16,5 +16,6 @@ services:
     volumes:
         - ./log:${APP_DIR}/log
         - ./metadata:${APP_DIR}/metadata
+        - ./data:${APP_DIR}/data
     restart: on-failure:3
     network_mode: host
diff --git a/ogc2ckan/mappings/ckan_fields/default.json b/ogc2ckan/mappings/ckan_fields/default.json
@@ -47,10 +47,10 @@
     {
         "ckan_object": "Dataset",
         "ckan_section": "Basic Info",
-        "metadata_info": "NTI-RISP Theme (M)",
-        "new_metadata_field": "theme_es",
+        "metadata_info": "MDR Themes (M)",
+        "new_metadata_field": "theme_eu",
         "multiplicity": "1.*",
-        "codelist": "http://datos.gob.es/kos/sector-publico/sector",
+        "codelist": "http://publications.europa.eu/resource/authority/data-theme/ENVI",
         "stored": "List[URI]"
     },
     {

diff --git a/ogc2ckan/mappings/ckan_fields/geodcatap.json b/ogc2ckan/mappings/ckan_fields/geodcatap.json
@@ -44,6 +44,15 @@
         "codelist": "https://inspire.ec.europa.eu/metadata-codelist/ResourceType,https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#section-7,https://id.loc.gov/vocabulary/marcgt.html",
         "stored": "URI"
     },
+    {
+        "ckan_object": "Dataset",
+        "ckan_section": "Basic Info",
+        "metadata_info": "MDR Themes (M)",
+        "new_metadata_field": "theme_eu",
+        "multiplicity": "1.*",
+        "codelist": "http://publications.europa.eu/resource/authority/data-theme",
+        "stored": "List[URI]"
+    },
     {
         "ckan_object": "Dataset",
         "ckan_section": "Basic Info",