docker: build the images from the local sources

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

diff --git a/docker/alpine/Dockerfile.armhf.master b/Dockerfile.armhf
similarity index 87%
rename from docker/alpine/Dockerfile.armhf.master
rename to Dockerfile.armhf
index 6c89adc3b9f734828f9e47257d4d1cea2a36c089..5dcc34aab006abed741c723197fa81004dd34b90 100644 (file)
--- a/docker/alpine/Dockerfile.armhf.master
+++ b/Dockerfile.armhf
@@ -1,5 +1,5 @@
 FROM lsiobase/alpine.armhf:3.6
-MAINTAINER Shaarli Community
+LABEL maintainer="Shaarli Community"
 
 RUN apk --update --no-cache add \
         ca-certificates \
@@ -21,9 +21,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 \