Small changes to README and CONTRIBUTING

[jirafeau_project.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e88b532b52c3e8012314c660a2ae203acf772c8e..9eb04233aa3b0d2d3acd2d55a0126c62a336b24f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,31 @@
-FROM php:7.3-fpm-alpine
-MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
-ARG USER_UID=2009
+FROM php:8.1-fpm-alpine
+LABEL org.opencontainers.image.authors="jerome@jutteau.fr"

 
 

-# install base
+# base install

 RUN apk update && \
 RUN apk update && \

+    apk add lighttpd && \
+    rm -rf /var/cache/apk/* && \

     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 

+COPY docker/cleanup.sh /cleanup.sh
+COPY docker/run.sh /run.sh
+RUN chmod o=,ug=rx /cleanup.sh /run.sh
+COPY docker/docker_config.php /docker_config.php

 
 

-# install jirafou
-RUN mkdir /www
-WORKDIR /www
-COPY .git .git
-RUN apk add git && \
-    git reset --hard && rm -rf .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \
-    apk del git && \
-    chown -R $USER_UID /www && \
-    chmod o=,ug=rwX -R /www && \
-    chmod +x docker/cleanup
-
-
-# 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 && \
-    mkdir -p /usr/local/etc/php
+RUN mkdir -p /usr/local/etc/php

 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 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/*
-
-
-CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
-EXPOSE 80
+# install jirafeau
+RUN mkdir /www
+WORKDIR /www
+# Will ignore some files through .dockerignore
+COPY . .
+RUN rm -rf docker && \
+    touch /www/lib/config.local.php && \
+    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chmod o=,ug=rwX -R /www
+
+CMD /run.sh
+EXPOSE 80
\ No newline at end of file