⚡️ IMPROVE: update config

Author: asapdotid

src/php/7.4/Dockerfile

@@ -5,8 +5,7 @@ ENV WEB_DOCUMENT_ROOT=${CONTAINER_WORKDIR_PATH} \
     WEB_DOCUMENT_INDEX=index.php \
     WEB_ALIAS_DOMAIN=*.local \
     WEB_PHP_TIMEOUT=600 \
-    WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
+    WEB_PHP_SOCKET=127.0.0.1:9000
 ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="80m"
 ENV TIMEZONE=Asia/Jakarta
 ENV PHP_DATE_TIMEZONE=${TIMEZONE}
@@ -21,11 +20,8 @@ COPY src/php/7.4/www/ $CONTAINER_WORKDIR_PATH/
 RUN ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime && echo $TIMEZONE > /etc/timezone
 
 RUN set -x \
-    # Install nginx
-    && apk-install \
-    nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && apk-install nginx \
+    && docker-run-bootstrap
 
 EXPOSE 80 443
 WORKDIR $CONTAINER_WORKDIR_PATH

src/php/7.4/conf/bin/service.d/nginx.d/10-init.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
     echo ""
     echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"

src/php/7.4/conf/provision/entrypoint.d/20-nginx.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Create tmp dir for nginx
 mkdir -p /var/tmp/nginx/
 

src/php/7.4/conf/provision/entrypoint.d/30-composer.sh

@@ -1,11 +1,21 @@
+#!/usr/bin/env bash
+
 # Composer install
 if [ "$SKIP_COMPOSER" != true ]; then
     # Try auto install for composer
     if [ -f "$CONTAINER_WORKDIR_PATH/composer.json" ]; then
         if [ "$APPLICATION_ENV" == "development" ]; then
-            composer install --working-dir=$CONTAINER_WORKDIR_PATH
+            composer install --working-dir="$CONTAINER_WORKDIR_PATH"
+            # Fix rights of vendor directory
+            chown -R "$APPLICATION_UID:$APPLICATION_GID" "$CONTAINER_WORKDIR_PATH/vendor"
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type d -exec chmod 755 {} \;
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type f -exec chmod 644 {} \;
         else
-            composer install --optimize-autoloader --no-interaction --no-progress --working-dir=$CONTAINER_WORKDIR_PATH
+            composer install --optimize-autoloader --no-interaction --no-progress --working-dir="$CONTAINER_WORKDIR_PATH"
+            # Fix rights of vendor directory
+            chown -R "$APPLICATION_UID:$APPLICATION_GID" "$CONTAINER_WORKDIR_PATH/vendor"
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type d -exec chmod 755 {} \;
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type f -exec chmod 644 {} \;
         fi
     fi
 fi

src/php/7.4/conf/service.d/nginx.d/10-init.sh

@@ -5,8 +5,7 @@ ENV WEB_DOCUMENT_ROOT=${CONTAINER_WORKDIR_PATH} \
     WEB_DOCUMENT_INDEX=index.php \
     WEB_ALIAS_DOMAIN=*.local \
     WEB_PHP_TIMEOUT=600 \
-    WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
+    WEB_PHP_SOCKET=127.0.0.1:9000
 ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="80m"
 ENV TIMEZONE=Asia/Jakarta
 ENV PHP_DATE_TIMEZONE=${TIMEZONE}
@@ -21,11 +20,8 @@ COPY src/php/8.1/www/ $CONTAINER_WORKDIR_PATH/
 RUN ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime && echo $TIMEZONE > /etc/timezone
 
 RUN set -x \
-    # Install nginx
-    && apk-install \
-    nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && apk-install nginx \
+    && docker-run-bootstrap
 
 EXPOSE 80 443
 WORKDIR $CONTAINER_WORKDIR_PATH

src/php/7.4/conf/service.d/nginx.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
     echo ""
     echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"

src/php/8.1/Dockerfile

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Create tmp dir for nginx
 mkdir -p /var/tmp/nginx/
 

src/php/8.1/conf/bin/service.d/nginx.d/10-init.sh

@@ -1,11 +1,21 @@
+#!/usr/bin/env bash
+
 # Composer install
 if [ "$SKIP_COMPOSER" != true ]; then
     # Try auto install for composer
     if [ -f "$CONTAINER_WORKDIR_PATH/composer.json" ]; then
         if [ "$APPLICATION_ENV" == "development" ]; then
-            composer install --working-dir=$CONTAINER_WORKDIR_PATH
+            composer install --working-dir="$CONTAINER_WORKDIR_PATH"
+            # Fix rights of vendor directory
+            chown -R "$APPLICATION_UID:$APPLICATION_GID" "$CONTAINER_WORKDIR_PATH/vendor"
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type d -exec chmod 755 {} \;
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type f -exec chmod 644 {} \;
         else
-            composer install --optimize-autoloader --no-interaction --no-progress --working-dir=$CONTAINER_WORKDIR_PATH
+            composer install --optimize-autoloader --no-interaction --no-progress --working-dir="$CONTAINER_WORKDIR_PATH"
+            # Fix rights of vendor directory
+            chown -R "$APPLICATION_UID:$APPLICATION_GID" "$CONTAINER_WORKDIR_PATH/vendor"
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type d -exec chmod 755 {} \;
+            find "$CONTAINER_WORKDIR_PATH/vendor" -type f -exec chmod 644 {} \;
         fi
     fi
 fi