fix input validation on required/regex setting

[jirafeau_mojo42.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e0b81bf10bef2abf9442119db25c8d704cd38017..9eb04233aa3b0d2d3acd2d55a0126c62a336b24f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,13 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
 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
 

-# install lighttpd
-RUN apk add lighttpd git
-
-# install jirafeau
-RUN mkdir /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/cleanup.sh /cleanup.sh
 COPY docker/run.sh /run.sh
 RUN chmod o=,ug=rx /cleanup.sh /run.sh


@@ -27,9 +17,15 @@ 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 apk del git
-RUN rm -rf /var/cache/apk/*
+# 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
 
 CMD /run.sh
 EXPOSE 80
\ No newline at end of file