Merge pull request #1157 from virtualtam/v0.9-dockerfile

[github/shaarli/Shaarli.git] / Dockerfile.armhf

diff --git a/docker/alpine/Dockerfile.armhf.latest b/Dockerfile.armhf
similarity index 77%
rename from docker/alpine/Dockerfile.armhf.latest
rename to Dockerfile.armhf
index c923834abb9871ae70135af61b50cabefcf998ee..24695633ce0df30a0ee24453fa23816d245d90cc 100644 (file)
--- a/docker/alpine/Dockerfile.armhf.latest
+++ b/Dockerfile.armhf
@@ -1,4 +1,5 @@
 FROM lsiobase/alpine.armhf:3.6
+LABEL maintainer="Shaarli Community"
 MAINTAINER Shaarli Community
 
 RUN apk --update --no-cache add \
@@ -21,9 +22,9 @@ RUN apk --update --no-cache add \
         php7-zlib \
         s6
 
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
-COPY services.d /etc/services.d
+COPY .docker/nginx.conf /etc/nginx/nginx.conf
+COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf
+COPY .docker/services.d /etc/services.d
 
 RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \
     && rm -rf /etc/php7/php-fpm.d/www.conf \
@@ -37,7 +38,9 @@ RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf -
     && cd shaarli \
     && composer --prefer-dist --no-dev install \
     && rm -rf ~/.composer \
-    && chown -R nginx:nginx .
+    && chown -R nginx:nginx . \
+    && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
+    && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
 
 VOLUME /var/www/shaarli/data