Skip to content

Commit

Permalink
working vanilla ckan through docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Mayer authored and Florian Mayer committed Jul 14, 2017
1 parent 59571f5 commit 7d01ead
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -18,8 +18,8 @@ RUN apt-get -q -y update && apt-get -q -y upgrade && \

# Define environment variables
ENV CKAN_HOME /usr/lib/ckan
ENV CKAN_VENV $CKAN_HOME/default
ENV CKAN_CONFIG /etc/ckan/default
ENV CKAN_VENV $CKAN_HOME/venv
ENV CKAN_CONFIG /etc/ckan
ENV CKAN_STORAGE_PATH=/var/lib/ckan

# Build-time variables specified by docker-compose.yml / .env
Expand Down Expand Up @@ -48,5 +48,5 @@ ENTRYPOINT ["/ckan-entrypoint.sh"]
USER ckan
EXPOSE 5000

CMD ["ckan-paster","serve","/etc/ckan/default/ckan.ini"]
CMD ["ckan-paster","serve","/etc/ckan/ckan.ini"]

8 changes: 5 additions & 3 deletions contrib/docker/docker-compose.yml
Expand Up @@ -22,13 +22,15 @@ services:
ports:
- "0.0.0.0:${CKAN_PORT}:5000"
environment:
# Using linked services:
- CKAN_SQLALCHEMY_URL=postgresql://ckan:${POSTGRES_PASSWORD}@db/ckan
- CKAN_SOLR_URL=http://solr:8983/solr/ckan
- CKAN_REDIS_URL=redis://redis:6379/1
- CKAN_SITE_URL=${CKAN_SITE_URL}
- CKAN_DATAPUSHER_URL=http://datapusher:8800
- CKAN_SITE_URL=${CKAN_SITE_URL}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
# Ingredients to interpolate service _URL
#- DB_PORT_5432_TCP_ADDR=db
#- DB_PORT_5432_TCP_PORT=${POSTGRES_PORT}
#- SOLR_PORT_8983_TCP_ADDR=solr
Expand All @@ -39,8 +41,8 @@ services:
#- DATAPUSHER_PORT_8800_PORT=8800

volumes:
- ckan_config:/etc/ckan/default
- ckan_home:/usr/lib/ckan/default
- ckan_config:/etc/ckan
- ckan_home:/usr/lib/ckan
- ckan_storage:/var/lib/ckan

datapusher:
Expand Down

0 comments on commit 7d01ead

Please sign in to comment.