From 6adc42a53d7517bba7d6c08a70d3402c1ee747b8 Mon Sep 17 00:00:00 2001
From: Raul Hidalgo Caballero <raul.hidalgo.sopa@gmail.com>
Date: Sun, 4 Dec 2016 22:17:31 +0100
Subject: [PATCH] chmod +x

---
 Dockerfile                        | 5 +++--
 contrib/docker/docker-compose.yml | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6e898e09c8f..5358fa2866f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# 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
 
@@ -5,8 +7,6 @@ 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 \
@@ -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
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 19b7cb2011b..4318ffd392f 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -1,3 +1,4 @@
+# docker-compose build && docker-compose up
 version: '2'
 services:
   ckan:
@@ -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"