[TASK] simplify Dockerfile

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/.dockerignore b/.dockerignore
new file mode 100644 (file)
index 0000000..3791a81
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+CHANGELOG.md
+CONTRIBUTING.md
+Dockerfile
+README.md
+composer.json
+.*
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
index f2a258ca74fdf455978e31e11f1fe1291f90272b..c911a76c9cc6388f3b930ad481fa65f4fe1cd7cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ composer.phar
 # Ignore file starting with dot, but keep others
 .*
 !.gitlab-ci.yml
 # Ignore file starting with dot, but keep others
 .*
 !.gitlab-ci.yml

-!.gitignore
\ No newline at end of file
+!.gitignore
+!.dockerignore
\ No newline at end of file

diff --git a/Dockerfile b/Dockerfile
index e0b81bf10bef2abf9442119db25c8d704cd38017..776fec0fc4696d73b167423242c8be1a9df23464 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,16 +7,17 @@ RUN apk update && \
     echo "UTC" > /etc/timezone
 
 # install lighttpd
     echo "UTC" > /etc/timezone
 
 # install lighttpd

-RUN apk add lighttpd git
+RUN apk add lighttpd

 
 # install jirafeau
 RUN mkdir /www
 WORKDIR /www
 
 # 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
+# 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

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


@@ -28,7 +29,6 @@ COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 # cleanup
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 # cleanup

-RUN apk del git

 RUN rm -rf /var/cache/apk/*
 
 CMD /run.sh
 RUN rm -rf /var/cache/apk/*
 
 CMD /run.sh