[BUGFIX] fix jirafeau docker image

- exposed port
- fix lighttpd user
- setup www-data group

diff --git a/Dockerfile b/Dockerfile
index fe59b7ea9e0aba44ffa368cf287e46d03e03387a..f0071d0679aa563b3b4371cfd021427686f21d09 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
 FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
 FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"

-ARG USER_UID=2009
+
+# lighttpd user
+ARG USER_UID=100
+# www-data group
+ARG GROUP_UID=82

 
 # install base
 RUN apk update && \
 
 # install base
 RUN apk update && \


@@ -15,7 +19,7 @@ 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 && \
 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 && \
+    chown -R $USER_UID.$GROUP_UID /www && \

     chmod o=,ug=rwX -R /www && \
     chmod +x docker/cleanup
 
     chmod o=,ug=rwX -R /www && \
     chmod +x docker/cleanup
 


@@ -35,4 +39,4 @@ RUN rm -rf /var/cache/apk/*
 
 
 CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
 
 
 CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf

-EXPOSE 80
+EXPOSE 80
\ No newline at end of file

diff --git a/docker/lighttpd.conf b/docker/lighttpd.conf
index bb3d548fb11d8a089b2e672c99a4b0a63740c577..e4be235c3ee5bea39bda13f779134bab32f41794 100644 (file)
--- a/docker/lighttpd.conf
+++ b/docker/lighttpd.conf
@@ -2,7 +2,7 @@ var.basedir  = "/www"
 var.logdir   = "/var/log/lighttpd"
 var.statedir = "/var/lib/lighttpd"
 
 var.logdir   = "/var/log/lighttpd"
 var.statedir = "/var/lib/lighttpd"
 

-server.port = 8080
+server.port = 80

 server.modules = (
     "mod_access",
     "mod_usertrack",
 server.modules = (
     "mod_access",
     "mod_usertrack",


@@ -13,8 +13,8 @@ server.modules = (
 include "mime-types.conf"
 include "mod_fastcgi_fpm.conf"
 
 include "mime-types.conf"
 include "mod_fastcgi_fpm.conf"
 

-#server.username      = "lighttpd"
-#server.groupname     = "lighttpd"
+server.username      = "lighttpd"
+server.groupname     = "www-data"

 
 server.pid-file      = "/run/lighttpd.pid"
 server.errorlog      = var.logdir  + "/error.log"
 
 server.pid-file      = "/run/lighttpd.pid"
 server.errorlog      = var.logdir  + "/error.log"