Merge pull request #25 from jkaninda/develop

Develop
jkaninda · Jan 14, 2024 · 74585d8 · 74585d8
2 parents 73bf23a + 80e3d64
commit 74585d8
Show file tree

Hide file tree

Showing 12 changed files with 250 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,8 @@ services:
     app:
         image: jkaninda/nginx-php-fpm:8.2
         container_name: my-app
-        restart: unless-stopped      
+        restart: unless-stopped 
+        user: www-data # Optional - for production usage    
         volumes:
         #Project root
             - ./:/var/www/html
@@ -115,10 +116,12 @@ WORKDIR /var/www/html
 
 # Custom cache invalidation / optional
 #ARG CACHEBUST=1
-# Run composer install / Optional
+# composer install / Optional
 #RUN composer install
 # Fix permissions
 RUN chown -R www-data:www-data /var/www/html
+
+USER www-data
 ```
 
 
@@ -130,7 +133,7 @@ RUN chown -R www-data:www-data /var/www/html
 
 ## Supervisord
 ### Add more supervisor process in
-> /var/www/html/conf/worker/supervisor.conf
+> /etc/supervisor/conf.d/
 
 In case you want to execute and maintain a task or process with supervisor.
 

diff --git a/src/conf/nginx/default.conf → src/default.conf b/src/conf/nginx/default.conf → src/default.conf
diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile
@@ -69,7 +69,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -78,16 +77,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
 
+RUN rm -rf /etc/nginx/nginx.conf
 
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
+
+#USER ${USER_NAME}
 EXPOSE 80
-CMD [ "entrypoint" ]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile
@@ -69,7 +69,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 
@@ -79,15 +78,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
 
+RUN rm -rf /etc/nginx/nginx.conf
+
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
+
+#USER ${USER_NAME}
 EXPOSE 80
-CMD [ "entrypoint" ]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile
@@ -69,7 +69,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -78,16 +77,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
 
+RUN rm -rf /etc/nginx/nginx.conf
 
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
+
+#USER ${USER_NAME}
 EXPOSE 80
-CMD [ "entrypoint" ]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile
@@ -81,7 +81,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -90,15 +89,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
 
+RUN rm -rf /etc/nginx/nginx.conf
+
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
+
+#USER ${USER_NAME}
 EXPOSE 80
-CMD [ "entrypoint" ]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile
@@ -82,7 +82,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -91,15 +90,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
+
+RUN rm -rf /etc/nginx/nginx.conf
+
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
-EXPOSE 80
-CMD [ "entrypoint" ]
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
 
+#USER ${USER_NAME}
+EXPOSE 80
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile
@@ -82,7 +82,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -91,17 +90,35 @@ 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"]
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
 
+RUN rm -rf /etc/nginx/nginx.conf
 
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
-EXPOSE 80
-CMD [ "entrypoint" ]
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
 
+
+#USER ${USER_NAME}
+EXPOSE 80
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/src/docker/8.3/Dockerfile b/src/docker/8.3/Dockerfile
@@ -82,7 +82,6 @@ RUN rm -Rf /var/www/* && \
 mkdir -p /var/www/html
 
 ADD src/index.php $WORKDIR/index.php
-ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 ADD src/php.ini $PHP_INI_DIR/conf.d/
 ADD src/opcache.ini $PHP_INI_DIR/conf.d/
 ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -91,18 +90,37 @@ 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"]
 
+RUN rm -rf /etc/nginx/conf.d/default.conf
+RUN rm -rf /etc/nginx/sites-enabled/default
+RUN rm -rf /etc/nginx/sites-available/default
+
+RUN rm -rf /etc/nginx/nginx.conf
 
+COPY src/nginx.conf /etc/nginx/nginx.conf
+COPY src/default.conf /etc/nginx/conf.d/
 
 RUN usermod -u ${USER_ID} ${USER_NAME}
 RUN groupmod -g ${USER_ID} ${GROUP_NAME}
+
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/nginx
+RUN mkdir -p /var/cache/nginx
+
 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/ && \
-  chown -R ${USER_NAME}:${GROUP_NAME} /etc/nginx/sites-available/
+  touch /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \
+  chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \
+  chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \
+  chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \
+  chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \
+  chown -R ${USER_NAME}:${GROUP_NAME} /tmp
+
+
 #USER ${USER_NAME}
 EXPOSE 80
-CMD [ "entrypoint" ]
+ENTRYPOINT ["entrypoint.sh"]