Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datapusher URL stays within docker-compose #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Datapusher URL stays within docker-compose #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
500f4af
Changes datapusher URL to use docker-compose assigned URL
riordan May 18, 2017
5cfabf7
Changes datapusher port back to 8800
riordan May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ckan/resources/production.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -216,4 +216,3 @@ formatter = generic

[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s

4 changes: 2 additions & 2 deletions datapusher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
CMD ["gunicorn", "--log-file=-", "-b", "0.0.0.0:8800", "wsgi"]
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -53,7 +53,7 @@ services:
container_name: ckan_datapusher
build: ./datapusher/
ports:
- "8000:8000"
- "8800:8800"
depends_on:
- ckan
environment:
Expand Down