diff --git a/ckan/resources/production.ini b/ckan/resources/production.ini index 8ffa5cb..b3ff7d8 100644 --- a/ckan/resources/production.ini +++ b/ckan/resources/production.ini @@ -154,7 +154,7 @@ ckan.max_image_size = 20 ckan.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet # this is set with environment vairables now -#ckan.datapusher.url = http://127.0.0.1:8000/ +#ckan.datapusher.url = http://127.0.0.1:8800/ # Resource Proxy settings # Preview size limit, default: 1MB @@ -216,4 +216,3 @@ formatter = generic [formatter_generic] format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s - diff --git a/datapusher/Dockerfile b/datapusher/Dockerfile index 2ad079c..081f122 100644 --- a/datapusher/Dockerfile +++ b/datapusher/Dockerfile @@ -33,6 +33,6 @@ RUN apk add --no-cache python \ COPY setup ${APP_DIR} -EXPOSE 8000 +EXPOSE 8800 -CMD ["gunicorn", "--log-file=-", "-b", "0.0.0.0:8000", "wsgi"] \ No newline at end of file +CMD ["gunicorn", "--log-file=-", "-b", "0.0.0.0:8800", "wsgi"] diff --git a/docker-compose.yml b/docker-compose.yml index 5abdd6c..aa01cc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,11 +36,11 @@ services: CKAN_SITE_URL: "${CKAN_SITE_URL}" CKAN_SITE_ID: "default" CKAN_STORAGE_PATH: "/var/lib/ckan" - CKAN_DATAPUSHER_URL: "${CKAN_SITE_URL}:8000" + CKAN_DATAPUSHER_URL: "http://datapusher:8800" CKAN_SOLR_URL: "http://solr:8983/solr/${POSTGRES_CKAN_DBNAME}" CKANEXT__CLOUDSTORAGE__DRIVER: "${CLOUDSTORAGE_DRIVER}" CKANEXT__CLOUDSTORAGE__CONTAINER_NAME: "${CLOUDSTORAGE_NAME}" - CKANEXT__CLOUDSTORAGE__DRIVER_OPTIONS: "${CLOUDSTORAGE_OPTIONS}" + CKANEXT__CLOUDSTORAGE__DRIVER_OPTIONS: "${CLOUDSTORAGE_OPTIONS}" SOLR_URL: "http://solr:8983/solr/${POSTGRES_CKAN_DBNAME}" EMAIL_TO: "${EMAIL_TO}" ERROR_EMAIL_FROM: "${ERROR_EMAIL_FROM}" @@ -53,7 +53,7 @@ services: container_name: ckan_datapusher build: ./datapusher/ ports: - - "8000:8000" + - "8800:8800" depends_on: - ckan environment: