diff --git a/.env.dev.example b/.env.dev.example index 8f3520d..3abf046 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -62,6 +62,8 @@ DATAPUSHER_VERSION=0.0.20 CKAN_DATAPUSHER_URL=http://datapusher:8800 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan-dev:5000 CKAN__DATAPUSHER__API_TOKEN=CHANGE_ME +# Handle https://stackoverflow.com/questions/23216804/ckan-upload-to-datastore-failed-resource-too-large-to-download +CKAN__RESOURCE_PROXY__MAX_FILE_SIZE=10485760 # NGINX NGINX_PORT=80 diff --git a/.env.example b/.env.example index 8038894..d447894 100644 --- a/.env.example +++ b/.env.example @@ -62,6 +62,8 @@ DATAPUSHER_VERSION=0.0.20 CKAN_DATAPUSHER_URL=http://datapusher:8800 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000 CKAN__DATAPUSHER__API_TOKEN=CHANGE_ME +# Handle https://stackoverflow.com/questions/23216804/ckan-upload-to-datastore-failed-resource-too-large-to-download +CKAN__RESOURCE_PROXY__MAX_FILE_SIZE=10485760 # NGINX NGINX_PORT=80 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index de97cc1..48dbf7e 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -7,7 +7,6 @@ volumes: vscode_server: services: - ckan-dev: build: context: ckan/ @@ -43,6 +42,8 @@ services: interval: 60s timeout: 10s retries: 3 + environment: + - DATAPUSHER_MAX_CONTENT_LENGTH=10485760 db: build: @@ -61,8 +62,9 @@ services: - pg_data:/var/lib/postgresql/data restart: unless-stopped healthcheck: - test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] - + test: + ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] + solr: image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} volumes: diff --git a/docker-compose.yml b/docker-compose.yml index c40d175..26e1ce4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ volumes: traefik-certificates: services: - traefik: image: traefik:v3.0 env_file: @@ -65,11 +64,18 @@ services: - ./src:/srv/app/src_extensions restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://ckan:5000/api/action/status_show"] + test: + [ + "CMD", + "wget", + "-qO", + "/dev/null", + "http://ckan:5000/api/action/status_show", + ] interval: 30s timeout: 10s retries: 6 - + datapusher: networks: - ckannet @@ -81,6 +87,8 @@ services: interval: 60s timeout: 10s retries: 3 + environment: + - DATAPUSHER_MAX_CONTENT_LENGTH=10485760 db: build: @@ -101,8 +109,9 @@ services: - pg_data:/var/lib/postgresql/data restart: unless-stopped healthcheck: - test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] - + test: + ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] + solr: networks: - solrnet @@ -120,7 +129,7 @@ services: restart: unless-stopped healthcheck: test: ["CMD", "redis-cli", "-e", "QUIT"] - + networks: webnet: ckannet: