[BUGFIX] Print nice error when install.php is missing and we need it.

[jirafeau_mojo42.git] / Dockerfile

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

 
 

+# install base

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

-    apk add lighttpd git && \

     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

 
 

+# install lighttpd
+RUN apk add lighttpd git
+
+# install jirafeau
+RUN mkdir /www

 WORKDIR /www
 WORKDIR /www

+COPY .git .git
+RUN git reset --hard && rm -rf docker install.php .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md
+RUN touch /www/lib/config.local.php
+RUN chown -R $(id -u lighttpd).$(id -g www-data) /www
+RUN chmod o=,ug=rwX -R /www
+
+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

 
 

+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

-COPY *.php LICENSE.txt ./
-COPY lib lib
-COPY media media

 
 

-RUN chown -R www-data. . && \
-    chmod o=,ug=rwX -R . && \
-    apk del git && \
-    rm -rf /var/cache/apk/*
+# cleanup
+RUN apk del git
+RUN rm -rf /var/cache/apk/*

 
 

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