aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-08-14 17:11:24 +0200
committerGitHub <noreply@github.com>2016-08-14 17:11:24 +0200
commitbb953a0106697c59101ef77022e2363446c5fc02 (patch)
treecd927a3b17225d30b7cb6644a35bb30059ea2e55 /docker
parentcc951468c01a708b5a0787fdfc8b1ca6e11b3c9b (diff)
parent665279ec99d31c7d571f90bf0186edb268020bb8 (diff)
downloadShaarli-bb953a0106697c59101ef77022e2363446c5fc02.tar.gz
Shaarli-bb953a0106697c59101ef77022e2363446c5fc02.tar.zst
Shaarli-bb953a0106697c59101ef77022e2363446c5fc02.zip
Merge pull request #638 from virtualtam/docker/stable/composer
Docker: update dependencies, introduce Composer (stable branch)
Diffstat (limited to 'docker')
-rw-r--r--docker/production/stable/Dockerfile23
1 files changed, 19 insertions, 4 deletions
diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile
index 2bb3948c..178d1cef 100644
--- a/docker/production/stable/Dockerfile
+++ b/docker/production/stable/Dockerfile
@@ -1,17 +1,32 @@
1FROM debian:jessie 1FROM debian:jessie
2MAINTAINER Shaarli Community 2MAINTAINER Shaarli Community
3 3
4ENV TERM dumb
4RUN apt-get update \ 5RUN apt-get update \
5 && apt-get install -y curl nginx-light php5-fpm php5-gd supervisor 6 && apt-get install --no-install-recommends -y \
7 ca-certificates \
8 curl \
9 nginx-light \
10 php5-curl \
11 php5-fpm \
12 php5-gd \
13 php5-intl \
14 supervisor \
15 && apt-get clean
6 16
7COPY nginx.conf /etc/nginx/nginx.conf 17COPY nginx.conf /etc/nginx/nginx.conf
8COPY supervised.conf /etc/supervisor/conf.d/supervised.conf 18COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
9 19
20ADD https://getcomposer.org/composer.phar /usr/local/bin/composer
21RUN chmod 755 /usr/local/bin/composer
22
10WORKDIR /var/www 23WORKDIR /var/www
24RUN curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xzf - \
25 && mv Shaarli-stable shaarli
26 && cd shaarli \
27 && composer --prefer-dist --no-dev install
11RUN rm -rf html \ 28RUN rm -rf html \
12 && curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xvzf - \ 29 && chown -R www-data:www-data .
13 && mv Shaarli-stable shaarli \
14 && chown -R www-data:www-data shaarli
15 30
16VOLUME /var/www/shaarli/data 31VOLUME /var/www/shaarli/data
17 32