Merge branch 'new-screenshots' into 'next-release'

[jirafeau_project.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 569a0faa33a72c88cf5f762f1e7d7b848dc1ffb9..d4854a8fcbdf4e01f330a041f1f4577d0feb83e9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,28 @@
-FROM php:7.3-fpm-alpine
-MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
+FROM php:8.1-fpm-alpine
+LABEL org.opencontainers.image.authors="jerome@jutteau.fr"

 
 

+# base install

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

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

     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \

-    echo "UTC" > /etc/timezone && \
-    mkdir -p /usr/local/etc/php / && \
-    mkdir /www
+    echo "UTC" > /etc/timezone

 
 

-WORKDIR /www
+COPY --chmod=550 docker/cleanup.sh docker/run.sh  /
+COPY --chmod=640 docker/docker_config.php /docker_config.php

 
 

-COPY .git .git
-RUN git reset --hard && rm -rf .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md

 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
 

-RUN chown -R www-data. . && \
-    chmod o=,ug=rwX -R . && \
-    apk del git && \
-    rm -rf /var/cache/apk/*
+# Install Jirafeau
+WORKDIR /www
+
+RUN --mount=type=bind,source=.,target=/mnt \
+    cp -r /mnt/* /www/ && \
+    rm -rf /www/docker && \
+    touch /www/lib/config.local.php && \
+    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chmod 770 /www

 
 

-CMD php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
-EXPOSE 80
+CMD ["/run.sh"]
+EXPOSE 80
\ No newline at end of file