diff options
Diffstat (limited to 'docker/alpine')
-rw-r--r-- | docker/alpine/Dockerfile.armhf.latest | 4 | ||||
-rw-r--r-- | docker/alpine/Dockerfile.armhf.master | 4 | ||||
-rw-r--r-- | docker/alpine/Dockerfile.latest | 5 | ||||
-rw-r--r-- | docker/alpine/Dockerfile.master | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/docker/alpine/Dockerfile.armhf.latest b/docker/alpine/Dockerfile.armhf.latest index c923834a..824a1926 100644 --- a/docker/alpine/Dockerfile.armhf.latest +++ b/docker/alpine/Dockerfile.armhf.latest | |||
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf - | |||
37 | && cd shaarli \ | 37 | && cd shaarli \ |
38 | && composer --prefer-dist --no-dev install \ | 38 | && composer --prefer-dist --no-dev install \ |
39 | && rm -rf ~/.composer \ | 39 | && rm -rf ~/.composer \ |
40 | && chown -R nginx:nginx . | 40 | && chown -R nginx:nginx . \ |
41 | && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \ | ||
42 | && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log | ||
41 | 43 | ||
42 | VOLUME /var/www/shaarli/data | 44 | VOLUME /var/www/shaarli/data |
43 | 45 | ||
diff --git a/docker/alpine/Dockerfile.armhf.master b/docker/alpine/Dockerfile.armhf.master index 7f1bdf85..6c89adc3 100644 --- a/docker/alpine/Dockerfile.armhf.master +++ b/docker/alpine/Dockerfile.armhf.master | |||
@@ -37,7 +37,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf - | |||
37 | && cd shaarli \ | 37 | && cd shaarli \ |
38 | && composer --prefer-dist --no-dev install \ | 38 | && composer --prefer-dist --no-dev install \ |
39 | && rm -rf ~/.composer \ | 39 | && rm -rf ~/.composer \ |
40 | && chown -R nginx:nginx . | 40 | && chown -R nginx:nginx . \ |
41 | && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \ | ||
42 | && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log | ||
41 | 43 | ||
42 | VOLUME /var/www/shaarli/data | 44 | VOLUME /var/www/shaarli/data |
43 | 45 | ||
diff --git a/docker/alpine/Dockerfile.latest b/docker/alpine/Dockerfile.latest index e9015c13..755d8751 100644 --- a/docker/alpine/Dockerfile.latest +++ b/docker/alpine/Dockerfile.latest | |||
@@ -42,7 +42,12 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \ | |||
42 | WORKDIR /var/www | 42 | WORKDIR /var/www |
43 | COPY --from=composer /app/shaarli shaarli | 43 | COPY --from=composer /app/shaarli shaarli |
44 | 44 | ||
45 | RUN chown -R nginx:nginx . \ | ||
46 | && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \ | ||
47 | && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log | ||
48 | |||
45 | VOLUME /var/www/shaarli/data | 49 | VOLUME /var/www/shaarli/data |
50 | |||
46 | EXPOSE 80 | 51 | EXPOSE 80 |
47 | 52 | ||
48 | ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] | 53 | ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] |
diff --git a/docker/alpine/Dockerfile.master b/docker/alpine/Dockerfile.master index 9cb4dec4..0472947f 100644 --- a/docker/alpine/Dockerfile.master +++ b/docker/alpine/Dockerfile.master | |||
@@ -42,7 +42,10 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \ | |||
42 | WORKDIR /var/www | 42 | WORKDIR /var/www |
43 | COPY --from=composer /app/shaarli shaarli | 43 | COPY --from=composer /app/shaarli shaarli |
44 | 44 | ||
45 | RUN chown -R nginx:nginx . | 45 | RUN chown -R nginx:nginx . \ |
46 | && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \ | ||
47 | && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log | ||
48 | |||
46 | VOLUME /var/www/shaarli/data | 49 | VOLUME /var/www/shaarli/data |
47 | 50 | ||
48 | EXPOSE 80 | 51 | EXPOSE 80 |