Merge pull request #70 from jkaninda/develop

Update php version, fix permission issue
jkaninda · Jan 6, 2024 · 34970e5 · 34970e5
2 parents 673a481 + 800c42b
commit 34970e5
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /.history
-laravel
+laravel
diff --git a/README.md b/README.md
@@ -52,7 +52,8 @@ services:
     php-fpm:
         image: jkaninda/laravel-php-fpm:latest
         container_name: php-fpm
-        restart: unless-stopped      
+        restart: unless-stopped
+        user: www-data #Use www-data user  production usage     
         volumes:
         #Project root
             - ./:/var/www/html

diff --git a/build.sh b/build.sh
@@ -11,7 +11,7 @@ then
   docker build -f src/docker/${tag}/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
 else
  echo 'Build latest'
- docker build -f src/docker/8.2/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
+ docker build -f src/docker/8.3/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
 
 fi
 
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
@@ -3,7 +3,8 @@ services:
     php-fpm:
         image: jkaninda/laravel-php-fpm
         container_name: php-fpm
-        restart: unless-stopped     
+        restart: unless-stopped
+        user: www-data #Use www-data user  production usage
         volumes:
         #Project root
             - ./:/var/www/html

diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile
@@ -3,6 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_VERSION=16.x
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -83,12 +87,12 @@ RUN ln -s /usr/local/bin/entrypoint.sh /
 
 ENTRYPOINT ["entrypoint.sh"]
 
-
-
-RUN usermod -u 1000 www-data
-RUN groupmod -g 1000 www-data
-
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
+  
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile
@@ -3,6 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_VERSION=16.x
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -83,12 +87,12 @@ RUN ln -s /usr/local/bin/entrypoint.sh /
 
 ENTRYPOINT ["entrypoint.sh"]
 
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-
-RUN usermod -u 1000 www-data
-RUN groupmod -g 1000 www-data
-
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile
@@ -3,8 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_VERSION=16.x
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -86,12 +88,12 @@ RUN ln -s /usr/local/bin/entrypoint.sh /
 
 ENTRYPOINT ["entrypoint.sh"]
 
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-
-RUN usermod -u ${HOST_UID} www-data
-RUN groupmod -g ${HOST_UID} www-data
-
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile
@@ -3,8 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_VERSION=16.x
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -86,12 +88,12 @@ RUN ln -s /usr/local/bin/entrypoint.sh /
 
 ENTRYPOINT ["entrypoint.sh"]
 
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-
-RUN usermod -u ${HOST_UID} www-data
-RUN groupmod -g ${HOST_UID} www-data
-
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile
@@ -3,8 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_VERSION=17.x
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -85,13 +87,15 @@ COPY src/entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/entrypoint.sh
 RUN ln -s /usr/local/bin/entrypoint.sh /
 
-ENTRYPOINT ["entrypoint.sh"]
 
+ENTRYPOINT ["entrypoint.sh"]
 
-RUN usermod -u ${HOST_UID} www-data
-RUN groupmod -g ${HOST_UID} www-data
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/8.1/Dockerfile.alpine b/src/docker/8.1/Dockerfile.alpine
@@ -2,8 +2,10 @@ FROM php:8.1-fpm-alpine
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 
 # Install the PHP pdo_mysql extention
 RUN docker-php-ext-install pdo_mysql

diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile
@@ -3,8 +3,10 @@ ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_MAJOR=20
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -88,12 +90,12 @@ RUN ln -s /usr/local/bin/entrypoint.sh /
 
 ENTRYPOINT ["entrypoint.sh"]
 
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-
-RUN usermod -u ${HOST_UID} www-data
-RUN groupmod -g ${HOST_UID} www-data
-
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/8.2/Dockerfile.alpine b/src/docker/8.2/Dockerfile.alpine
@@ -2,8 +2,10 @@ FROM php:8.2-fpm-alpine
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 
 # Install the PHP pdo_mysql extention
 RUN docker-php-ext-install pdo_mysql

diff --git a/src/docker/8.3/Dockerfile b/src/docker/8.3/Dockerfile
@@ -1,10 +1,12 @@
-FROM php:8.3.0-fpm
+FROM php:8.3.1-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
 ENV NODE_MAJOR=20
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -86,14 +88,15 @@ COPY src/entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/entrypoint.sh
 RUN ln -s /usr/local/bin/entrypoint.sh /
 
-ENTRYPOINT ["entrypoint.sh"]
-
 
+ENTRYPOINT ["entrypoint.sh"]
 
-RUN usermod -u ${HOST_UID} www-data
-RUN groupmod -g ${HOST_UID} www-data
+RUN usermod -u ${USER_ID} ${USER_NAME}
+RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
 
-RUN chmod -R 755 $WORKDIR
-RUN chown -R www-data:www-data $WORKDIR
 EXPOSE 9000
 CMD [ "entrypoint" ]
diff --git a/src/docker/8.3/Dockerfile.alpine b/src/docker/8.3/Dockerfile.alpine
@@ -2,8 +2,10 @@ FROM php:8.3-fpm-alpine
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ARG HOST_UID=1000
-ENV USER=www-data
+ARG GROUP_ID=1000
+ARG USER_ID=1000
+ENV USER_NAME=www-data
+ARG GROUP_NAME=www-data
 
 # Install the PHP pdo_mysql extention
 RUN docker-php-ext-install pdo_mysql