Jirafeau version 4.4.0

[jirafeau_project.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index dd75d58ae1770b14de2039e77a693ce8a0f67b0e..4256ea8f9655f33dbded307677b71e0a634a3026 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
 
 # lighttpd user
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
 
 # lighttpd user

-ARG USER_UID=100
+ARG USER_ID=100

 # www-data group
 # www-data group

-ARG GROUP_UID=82
+ARG GROUP_ID=82

 
 # install base
 RUN apk update && \
 
 # install base
 RUN apk update && \


@@ -17,31 +17,27 @@ RUN mkdir /www
 WORKDIR /www
 COPY .git .git
 RUN apk add git && \
 WORKDIR /www
 COPY .git .git
 RUN apk add git && \

-    git reset --hard && rm -rf docker .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \
+    git reset --hard && rm -rf docker install.php .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \

     apk del git && \
     touch /www/lib/config.local.php && \
     apk del git && \
     touch /www/lib/config.local.php && \

-    chown -R $USER_UID.$GROUP_UID /www && \
+    chown -R $USER_ID.$GROUP_ID /www && \

     chmod o=,ug=rwX -R /www
 
 COPY docker/cleanup.sh /cleanup.sh
     chmod o=,ug=rwX -R /www
 
 COPY docker/cleanup.sh /cleanup.sh

-RUN chmod o=,ug=rx /cleanup.sh

 COPY docker/run.sh /run.sh
 COPY docker/run.sh /run.sh

-RUN chmod o=,ug=rx /run.sh
+RUN chmod o=,ug=rx /cleanup.sh /run.sh

 COPY docker/docker_config.php /docker_config.php
 
 # install lighttpd
 RUN apk add lighttpd php7-mcrypt && \
     echo "extension=/usr/lib/php7/modules/mcrypt.so" > /usr/local/etc/php/conf.d/mcrypt.ini && \
 COPY docker/docker_config.php /docker_config.php
 
 # install lighttpd
 RUN apk add lighttpd php7-mcrypt && \
     echo "extension=/usr/lib/php7/modules/mcrypt.so" > /usr/local/etc/php/conf.d/mcrypt.ini && \

-    chown -R $USER_UID /var/log/lighttpd && \
-    chmod oug=rwX /run && \
+    chown -R $USER_ID /var/log/lighttpd && \

     mkdir -p /usr/local/etc/php
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
     mkdir -p /usr/local/etc/php
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 

-

 # cleanup
 RUN rm -rf /var/cache/apk/*
 
 # cleanup
 RUN rm -rf /var/cache/apk/*
 

-

 CMD /run.sh
 EXPOSE 80
\ No newline at end of file
 CMD /run.sh
 EXPOSE 80
\ No newline at end of file