CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

fix and add features
This commit is contained in:
KirilPoposki98 2024-08-29 09:38:34 +02:00 committed by GitHub
parent 357f479add 0ee692b8f4
commit 95bb72d20a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/2.10/.env
View File

@ -27,6 +27,7 @@ DATAPUSHER_DOWNLOAD_TIMEOUT=30
DATAPUSHER_SSL_VERIFY=False DATAPUSHER_SSL_VERIFY=False
DATAPUSHER_REWRITE_RESOURCES=True DATAPUSHER_REWRITE_RESOURCES=True
DATAPUSHER_REWRITE_URL=http://ckan:5005 DATAPUSHER_REWRITE_URL=http://ckan:5005
DATAPUSHER_SSL_VERIFY=False
# SOLR # SOLR
CKAN_CORE_NAME=ckan CKAN_CORE_NAME=ckan

23
compose/2.10/docker-compose.yml
View File

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

2
compose/2.11/.env
View File

@ -27,7 +27,7 @@ DATAPUSHER_DOWNLOAD_TIMEOUT=30
DATAPUSHER_SSL_VERIFY=False DATAPUSHER_SSL_VERIFY=False
DATAPUSHER_REWRITE_RESOURCES=True DATAPUSHER_REWRITE_RESOURCES=True
DATAPUSHER_REWRITE_URL=http://ckan:5005 DATAPUSHER_REWRITE_URL=http://ckan:5005
DATA_PUSHER_SSL_VERIFY=False DATAPUSHER_SSL_VERIFY=False
# SOLR # SOLR
CKAN_CORE_NAME=ckan CKAN_CORE_NAME=ckan

23
compose/2.11/docker-compose.yml
View File

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

2
images/ckan/2.10/Dockerfile
View File

@ -74,7 +74,7 @@ ENV DEFAULT_EXTENSIONS envvars
# Locations and tags, please use specific tags or revisions # Locations and tags, please use specific tags or revisions
ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars 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 \ RUN apk add --no-cache \
python3 \ python3 \

2
images/ckan/2.10/Dockerfile.focal
View File

@ -97,7 +97,7 @@ ENV DEFAULT_EXTENSIONS envvars
# Locations and tags, please use specific tags or revisions # Locations and tags, please use specific tags or revisions
ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars 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 && \ RUN apt-get update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \