Skip to content

Commit

Permalink
chmod +x
Browse files Browse the repository at this point in the history
  • Loading branch information
Raul Hidalgo Caballero committed Dec 4, 2016
1 parent 2c22fd3 commit 6adc42a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
@@ -1,12 +1,12 @@
# docker build . -t ckan && docker run -d -p 80:5000 --link db:db --link redis:redis --link solr:solr ckan

FROM debian:jessie
MAINTAINER Open Knowledge

ENV CKAN_HOME /usr/lib/ckan/default
ENV CKAN_CONFIG /etc/ckan/default
ENV CKAN_DATA /var/lib/ckan

# docker run -d -p 80:5000 --link db:db --link redis:redis --link solr:solr ckan

# Install required packages
RUN apt-get -q -y update && apt-get -q -y upgrade && DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
python-dev \
Expand All @@ -33,6 +33,7 @@ RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini

# SetUp EntryPoint
COPY ./contrib/docker/ckan-entrypoint.sh /
RUN chmod +x /ckan-entrypoint.sh
ENTRYPOINT ["/ckan-entrypoint.sh"]

# Volumes
Expand Down
7 changes: 7 additions & 0 deletions contrib/docker/docker-compose.yml
@@ -1,3 +1,4 @@
# docker-compose build && docker-compose up
version: '2'
services:
ckan:
Expand All @@ -21,13 +22,19 @@ services:
image: ckan/postgresql:latest
build:
context: ./postgresql/
ports:
- "5432:5432"

solr:
container_name: solr
image: ckan/solr:latest
build:
context: ./solr/
ports:
- "8983:8983"

redis:
container_name: redis
image: redis:latest
ports:
- "6379:6379"

0 comments on commit 6adc42a

Please sign in to comment.