Merge pull request #136 from keitaroinc/fix-and-add-features

fix and add features
keitaroinc · Aug 29, 2024 · 95bb72d · 95bb72d · KBrianNgeno · Aug 29, 2024
2 parents 357f479 + 0ee692b
commit 95bb72d
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 11 deletions.
diff --git a/compose/2.10/.env b/compose/2.10/.env
@@ -27,6 +27,7 @@ DATAPUSHER_DOWNLOAD_TIMEOUT=30
 DATAPUSHER_SSL_VERIFY=False
 DATAPUSHER_REWRITE_RESOURCES=True
 DATAPUSHER_REWRITE_URL=http://ckan:5005
+DATAPUSHER_SSL_VERIFY=False
 
 # SOLR
 CKAN_CORE_NAME=ckan

diff --git a/compose/2.10/docker-compose.yml b/compose/2.10/docker-compose.yml
@@ -12,8 +12,12 @@ services:
       - frontend
       - backend
     depends_on:
-      - db
-      - solr
+      db:
+        condition: service_healthy
+        restart: true
+      solr:
+        condition: service_healthy
+        restart: true
     ports:
       - "0.0.0.0:${CKAN_PORT}:5000"
     env_file:
@@ -28,7 +32,6 @@ services:
       - CKAN_MAX_UPLOAD_SIZE_MB=${CKAN_MAX_UPLOAD_SIZE_MB}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
-
     volumes:
       - ckan_data:/srv/app/data
 
@@ -45,7 +48,7 @@ services:
       - DATAPUSHER_CHUNK_SIZE=${DATAPUSHER_CHUNK_SIZE}
       - DATAPUSHER_CHUNK_INSERT_ROWS=${DATAPUSHER_CHUNK_INSERT_ROWS}
       - DATAPUSHER_DOWNLOAD_TIMEOUT=${DATAPUSHER_DOWNLOAD_TIMEOUT}
-      - DATAPUSHER_SSL_VERIFY=${DATA_PUSHER_SSL_VERIFY}
+      - DATAPUSHER_SSL_VERIFY=${DATAPUSHER_SSL_VERIFY}
       - DATAPUSHER_REWRITE_RESOURCES=${DATAPUSHER_REWRITE_RESOURCES}
       - DATAPUSHER_REWRITE_URL=${DATAPUSHER_REWRITE_URL}
 
@@ -82,12 +85,24 @@ services:
     volumes:
       - solr_data:/var/solr
       - ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
+    healthcheck:
+      test: ["CMD-SHELL", "/opt/solr/bin/solr","status"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
 
   redis:
     container_name: redis
     image: redis:${REDIS_VERSION}
     networks:
       - backend
+    healthcheck:
+      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
 networks:
   frontend:

diff --git a/compose/2.11/.env b/compose/2.11/.env
@@ -27,7 +27,7 @@ DATAPUSHER_DOWNLOAD_TIMEOUT=30
 DATAPUSHER_SSL_VERIFY=False
 DATAPUSHER_REWRITE_RESOURCES=True
 DATAPUSHER_REWRITE_URL=http://ckan:5005
-DATA_PUSHER_SSL_VERIFY=False
+DATAPUSHER_SSL_VERIFY=False
 
 # SOLR
 CKAN_CORE_NAME=ckan

diff --git a/compose/2.11/docker-compose.yml b/compose/2.11/docker-compose.yml
@@ -12,8 +12,12 @@ services:
       - frontend
       - backend
     depends_on:
-      - db
-      - solr
+      db:
+        condition: service_healthy
+        restart: true
+      solr:
+        condition: service_healthy
+        restart: true
     ports:
       - "0.0.0.0:${CKAN_PORT}:5000"
     env_file:
@@ -28,7 +32,6 @@ services:
       - CKAN_MAX_UPLOAD_SIZE_MB=${CKAN_MAX_UPLOAD_SIZE_MB}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
-
     volumes:
       - ckan_data:/srv/app/data
 
@@ -45,7 +48,7 @@ services:
       - DATAPUSHER_CHUNK_SIZE=${DATAPUSHER_CHUNK_SIZE}
       - DATAPUSHER_CHUNK_INSERT_ROWS=${DATAPUSHER_CHUNK_INSERT_ROWS}
       - DATAPUSHER_DOWNLOAD_TIMEOUT=${DATAPUSHER_DOWNLOAD_TIMEOUT}
-      - DATAPUSHER_SSL_VERIFY=${DATA_PUSHER_SSL_VERIFY}
+      - DATAPUSHER_SSL_VERIFY=${DATAPUSHER_SSL_VERIFY}
       - DATAPUSHER_REWRITE_RESOURCES=${DATAPUSHER_REWRITE_RESOURCES}
       - DATAPUSHER_REWRITE_URL=${DATAPUSHER_REWRITE_URL}
 
@@ -82,12 +85,24 @@ services:
     volumes:
       - solr_data:/var/solr
       - ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
+    healthcheck:
+      test: ["CMD-SHELL", "/opt/solr/bin/solr","status"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
 
   redis:
     container_name: redis
     image: redis:${REDIS_VERSION}
     networks:
       - backend
+    healthcheck:
+      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
 networks:
   frontend:

diff --git a/images/ckan/2.10/Dockerfile b/images/ckan/2.10/Dockerfile
@@ -74,7 +74,7 @@ ENV DEFAULT_EXTENSIONS envvars
 
 # Locations and tags, please use specific tags or revisions
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
-ENV ENVVARS_GIT_BRANCH=0.0.2
+ENV ENVVARS_GIT_BRANCH=v0.0.4
 
 RUN apk add --no-cache \
         python3 \

diff --git a/images/ckan/2.10/Dockerfile.focal b/images/ckan/2.10/Dockerfile.focal
@@ -97,7 +97,7 @@ ENV DEFAULT_EXTENSIONS envvars
 
 # Locations and tags, please use specific tags or revisions
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
-ENV ENVVARS_GIT_BRANCH=0.0.1
+ENV ENVVARS_GIT_BRANCH=v0.0.4
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \