From e6e2b1248ddd21c653cf9879df05076f18faa67b Mon Sep 17 00:00:00 2001 From: Julien Del-Piccolo Date: Mon, 16 Jan 2017 18:20:20 +0100 Subject: [PATCH] Fix Dockerfile --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e8e45b..1339eb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,13 @@ ARG COMMIT="" LABEL branch=${BRANCH} LABEL commit=${COMMIT} -RUN apk update && apk add --no-cache supervisor apache2 php5-apache2 php5-ctype \ - && apk add --virtual=.build-dependencies php5 php5-phar php5-json php5-openssl git \ - && rm -rf /var/www/localhost/htdocs/* \ - && cd /var/www/localhost/htdocs/ \ - && git init && git remote add origin https://github.com/jdel/sspks.git \ - && git fetch origin ${COMMIT} \ - && wget -q -O /usr/local/bin/composer http://getcomposer.org/download/1.3.1/composer.phar \ +RUN apk update && apk add --no-cache supervisor apache2 php5-apache2 php5-phar php5-ctype \ + && apk add --virtual=.build-dependencies openssl php5 php5-json php5-openssl git \ + && rm -rf /var/www/localhost/htdocs \ + && wget -O /var/www/localhost/sspks.zip https://github.com/jdel/sspks/archive/${COMMIT}.zip \ + && unzip /var/www/localhost/sspks.zip -d /var/www/localhost/ \ + && mv /var/www/localhost/sspks-*/ /var/www/localhost/htdocs/ && cd /var/www/localhost/htdocs \ + && wget -q -O /usr/local/bin/composer https://getcomposer.org/download/1.3.1/composer.phar \ && chmod +x /usr/local/bin/composer \ && cd /var/www/localhost/htdocs \ && composer install --no-dev \ @@ -26,4 +26,4 @@ COPY ./docker/supervisord.conf /usr/local/etc/supervisor/ EXPOSE 80 VOLUME "/var/www/localhost/htdocs/packages" -CMD ["/usr/bin/supervisord", "-c", "/usr/local/etc/supervisor/supervisord.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord", "-c", "/usr/local/etc/supervisor/supervisord.conf"]