Skip to content

Commit

Permalink
Fix Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
jdel authored Jan 16, 2017
1 parent e630133 commit e6e2b12
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"]
CMD ["/usr/bin/supervisord", "-c", "/usr/local/etc/supervisor/supervisord.conf"]

0 comments on commit e6e2b12

Please sign in to comment.