fix: review format support

Author: wilcorrea

hyperf/.scripts/setup-dev.sh

@@ -2,46 +2,43 @@ set -e
 
 SONAR_SCANNER_VERSION=6.2.1.4610
 
-if ! command -v apk &> /dev/null; then
-  echo "Error: 'apk' not found. Make sure you are running this script in an Alpine Linux environment." >&2
-  exit 1
+if [ "$1" = "dev" ]; then
+  if ! command -v apk &> /dev/null; then
+    echo "Error: 'apk' not found. Make sure you are running this script in an Alpine Linux environment." >&2
+    exit 1
+  fi
+
+  if ! command -v composer &> /dev/null; then
+    echo "Error: 'composer' not found. Make sure it is installed and accessible in the system PATH." >&2
+    exit 1
+  fi
+
+  echo "[$1] Installing PHP extensions and dependencies"
+
+  apk add --no-cache \
+      libstdc++ \
+      ca-certificates \
+      libc6-compat \
+      openjdk17-jre \
+      php83-pecl-xdebug \
+      php83-pecl-pcov
+
+  {
+    echo "opcache.enable=0"
+    echo "opcache.interned_strings_buffer=72"
+    echo "xdebug.mode=develop,debug,coverage"
+    echo "xdebug.idekey=PHPSTORM"
+  } >> /etc/php83/conf.d/zzz_2_php.ini
+
+  mkdir -p /opt
+  curl -fSL https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip \
+    -o /opt/sonar-scanner.zip
+
+  unzip -qq /opt/sonar-scanner.zip -d /opt
+  mv /opt/sonar-scanner-${SONAR_SCANNER_VERSION}-linux-x64 /sonar-scanner
+  rm /opt/sonar-scanner.zip
+
+  ln -s /sonar-scanner/bin/sonar-scanner /bin/sonar-scanner
+
+  sed -i 's/use_embedded_jre=true/use_embedded_jre=false/g' /sonar-scanner/bin/sonar-scanner
 fi
-
-if ! command -v composer &> /dev/null; then
-  echo "Error: 'composer' not found. Make sure it is installed and accessible in the system PATH." >&2
-  exit 1
-fi
-
-echo "[$1] Installing PHP extensions and dependencies"
-
-apk add --no-cache \
-    libstdc++ \
-    ca-certificates \
-    curl \
-    unzip \
-    libc6-compat \
-    openjdk17-jre \
-    php83-pecl-xdebug \
-    php83-pecl-pcov
-
-cd /etc/php83
-{
-  echo "opcache.enable=0"
-  echo "opcache.interned_strings_buffer=72"
-} >> conf.d/99_php.ini
-{
-  echo "xdebug.mode=develop,debug,coverage"
-  echo "xdebug.idekey=PHPSTORM"
-} >> conf.d/50_xdebug.ini
-
-mkdir -p /opt
-curl -fSL https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip \
-  -o /opt/sonar-scanner.zip
-
-unzip -qq /opt/sonar-scanner.zip -d /opt
-mv /opt/sonar-scanner-${SONAR_SCANNER_VERSION}-linux-x64 /sonar-scanner
-rm /opt/sonar-scanner.zip
-
-ln -s /sonar-scanner/bin/sonar-scanner /bin/sonar-scanner
-
-sed -i 's/use_embedded_jre=true/use_embedded_jre=false/g' /sonar-scanner/bin/sonar-scanner

hyperf/.scripts/setup.sh

@@ -6,13 +6,12 @@ git config --global --add safe.directory /opt/www
 git config --global init.defaultBranch main
 
 # - config PHP
-cd /etc/php83
 {
     echo "upload_max_filesize=128M"
     echo "post_max_size=128M"
     echo "memory_limit=1G"
     echo "date.timezone=${TIMEZONE}"
-} | tee conf.d/99_overrides.ini
+} | tee /etc/php83/conf.d/zzz_0_php.ini
 
 # - config timezone
 ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime

hyperf/Dockerfile

@@ -15,10 +15,6 @@ RUN apk update && \
     apk add --no-cache bash curl git unzip && \
     mkdir -p /opt/www
 
-COPY .scripts /devitools/.scripts
-
-WORKDIR /opt/www
-
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 
 RUN apk add --no-cache \
@@ -54,21 +50,23 @@ RUN apk add --no-cache \
         php83-xmlwriter=8.3.15-r0 \
         php83-zip=8.3.15-r0 \
     && ln -sf /usr/bin/php83 /usr/bin/php \
-    && mv /etc/php/php.ini /etc/php83/conf.d/zphp.ini \
+    && mv /etc/php/php.ini /etc/php83/conf.d/zzz_1_php.ini \
     && mv /etc/php/php-fpm.conf /etc/php83/php-fpm.d/zphp.conf
 
 COPY --from=composer/composer:2.8.5-bin /composer /usr/local/bin/composer
 
+COPY .scripts /devitools/.scripts
+
 # update
 RUN set -ex \
-    && if [ "$APP_TARGET" = "dev" ]; then \
-           bash /devitools/.scripts/setup-dev.sh; \
-       fi \
     # ---------- apply settings -------\
     && bash /devitools/.scripts/setup.sh "$TIMEZONE" \
+    && bash /devitools/.scripts/setup-dev.sh "$APP_TARGET" \
     # ---------- clear works ----------\
     && rm -rf /var/cache/apk/* /tmp/* /usr/share/man
 
+WORKDIR /opt/www
+
 EXPOSE 9501
 
 ENTRYPOINT [ "php", "/opt/www/bin/hyperf.php" ]