Merge pull request #3 from psaux-it/env_dev

hsntgm · web-flow · commit 8d22726a512e · 2025-02-07T22:53:26.000+03:00
dev_deploy
diff --git a/.env b/.env
@@ -23,7 +23,7 @@ export NPP_NGINX_PARAMS_CONF=./nginx/fastcgi_params
 export NGINX_LOGS=./logs/nginx
 
 # WP-CLI Settings
-export WORDPRESS_SITE_URL_=https://localhost
+export WORDPRESS_SITE_URL_=https://172.19.0.3
 export WORDPRESS_SITE_TITLE_="NPP Dockerized"
 export WORDPRESS_ADMIN_USER_=npp
 export WORDPRESS_ADMIN_PASSWORD_=npp
@@ -48,6 +48,14 @@ export NPP_USER_=npp
 export NPP_UID_=18978
 export NPP_GID_=33749
 
+# NPP Switch Development environment
+export NPP_DEV_ENABLED_=1
+export NPP_DEV_PLUGIN_NAME_=fastcgi-cache-purge-and-preload-nginx
+export NPP_DEV_PLUGIN_DIR_="${NPP_WEB_ROOT_}/wp-content/plugins/${NPP_DEV_PLUGIN_NAME_}"
+export NPP_DEV_TMP_CLONE_DIR_="/tmp/${NPP_DEV_PLUGIN_NAME_}"
+export NPP_DEV_PLUGIN_FILE_="${NPP_DEV_PLUGIN_DIR_}/${NPP_DEV_PLUGIN_NAME_}.php"
+export NPP_DEV_GITHUB_REPO_="https://github.com/psaux-it/nginx-fastcgi-cache-purge-and-preload.git"
+
 # Plugins to Install (comma seperated)
 export NPP_PLUGINS_="fastcgi-cache-purge-and-preload-nginx"
 
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ docker compose up -d --build
 
 ### 🚀 **Post-Container Startup Access**
 - The WordPress site can be accessed at the host machine:
-  - 🔒 [https://localhost](https://localhost)
-  - 🌐 [http://localhost](http://localhost)
+  - 🔒 [https://172.19.0.3](https://172.19.0.3)
+  - 🌐 [http://172.19.0.3](http://172.19.0.3)
 
 - Default WordPress **wp-admin** login credentials:
   - **Username**: `npp`
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,14 +30,20 @@ services:
       - WORDPRESS_CONFIG_EXTRA=
           define('FORCE_SSL_ADMIN', true);
           define('FORCE_SSL_LOGIN', true);
-          if (defined('WP_CLI') && WP_CLI && !isset($$_SERVER['HTTP_HOST'])) { $$_SERVER['HTTP_HOST'] = "localhost"; }
+          if (defined('WP_CLI') && WP_CLI && !isset($$_SERVER['HTTP_HOST'])) $$_SERVER['HTTP_HOST'] = "172.19.0.3";
       - NPP_WEB_ROOT=${NPP_WEB_ROOT_}
       - NPP_NGINX_CACHE_PATH=${NPP_NGINX_CACHE_PATH_}
       - NPP_USER=${NPP_USER_}
       - NPP_UID=${NPP_UID_}
       - NPP_GID=${NPP_GID_}
       - NPP_PLUGINS=${NPP_PLUGINS_}
       - NPP_THEMES=${NPP_THEMES_}
+      - NPP_DEV_ENABLED=${NPP_DEV_ENABLED_}
+      - NPP_DEV_PLUGIN_NAME=${NPP_DEV_PLUGIN_NAME_}
+      - NPP_DEV_PLUGIN_DIR=${NPP_DEV_PLUGIN_DIR_}
+      - NPP_DEV_TMP_CLONE_DIR=${NPP_DEV_TMP_CLONE_DIR_}
+      - NPP_DEV_PLUGIN_FILE=${NPP_DEV_PLUGIN_FILE_}
+      - NPP_DEV_GITHUB_REPO=${NPP_DEV_GITHUB_REPO_}
       - MOUNT_DIR=${MOUNT_DIR_}
       - WORDPRESS_SITE_URL=${WORDPRESS_SITE_URL_}
       - WORDPRESS_SITE_TITLE=${WORDPRESS_SITE_TITLE_}
@@ -118,6 +124,7 @@ services:
       - NPP_UID=${NPP_UID_}
       - NPP_GID=${NPP_GID_}
       - NGINX_WEB_USER=${NGINX_WEB_USER_}
+      - MOUNT_DIR=${MOUNT_DIR_}
     networks:
       npp_network:
         ipv4_address: 172.19.0.3
diff --git a/nginx/entrypoint-nginx.sh b/nginx/entrypoint-nginx.sh
@@ -65,7 +65,7 @@ wait_for_service "wordpress" 9001
 wait_for_service "wordpress" 9999
 
 # Check if required environment variables are set
-for var in NPP_UID NPP_GID NPP_USER NPP_WEB_ROOT NGINX_WEB_USER; do
+for var in NPP_UID NPP_GID NPP_USER NPP_WEB_ROOT NGINX_WEB_USER MOUNT_DIR; do
     if [[ -z "${!var:-}" ]]; then
         echo -e "${COLOR_RED}${COLOR_BOLD}NPP-NGINX-FATAL:${COLOR_RESET} Missing required environment variable: ${COLOR_LIGHT_CYAN}${var}${COLOR_RESET} - ${COLOR_RED}Exiting...${COLOR_RESET}"
         exit 1
@@ -106,15 +106,22 @@ echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━
 
 # URL Access Information
 echo -e "\n${COLOR_GREEN}${COLOR_BOLD}🔑 Access your WordPress admin page at:${COLOR_RESET}"
-echo -e "${COLOR_LIGHT_CYAN}https://localhost/wp-admin${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}URL: ${COLOR_RESET}${COLOR_BOLD}https://172.19.0.3/wp-admin${COLOR_RESET}"
 
 # Separator for credentials
 echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
 
 # Default credentials
 echo -e "\n${COLOR_GREEN}${COLOR_BOLD}📝 Default Credentials:${COLOR_RESET}"
-echo -e "${COLOR_LIGHT_CYAN}Username: ${COLOR_RESET}${COLOR_BOLD}npp${COLOR_RESET}"
-echo -e "${COLOR_LIGHT_CYAN}Password: ${COLOR_RESET}${COLOR_BOLD}npp${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}Username: ${COLOR_RESET}${COLOR_BOLD}${NPP_USER}${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}Password: ${COLOR_RESET}${COLOR_BOLD}${NPP_USER}${COLOR_RESET}"
+
+# Separator for cache path
+echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
+
+# Default Nginx cache path
+echo -e "\n${COLOR_GREEN}${COLOR_BOLD}💾 Nginx Cache Path:${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}Path: ${COLOR_RESET}${COLOR_BOLD}${MOUNT_DIR}${COLOR_RESET}"
 
 # Final separator
 echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
diff --git a/wordpress/Dockerfile b/wordpress/Dockerfile
@@ -49,6 +49,9 @@ RUN apt-get update && apt-get install -y \
     netcat-traditional \
     # Install common dependencies
     curl \
+    # Install dev deploy dependencies
+    git \
+    dos2unix \
     # Install build time dependencies for 'bindfs' 
     build-essential \
     automake \
diff --git a/wordpress/wp-cli.sh b/wordpress/wp-cli.sh
@@ -63,6 +63,12 @@ for var in \
     NPP_USER \
     NPP_UID \
     NPP_GID \
+    NPP_DEV_ENABLED \
+    NPP_DEV_PLUGIN_NAME \
+    NPP_DEV_PLUGIN_DIR \
+    NPP_DEV_TMP_CLONE_DIR \
+    NPP_DEV_PLUGIN_FILE \
+    NPP_DEV_GITHUB_REPO \
     WORDPRESS_DB_USER \
     WORDPRESS_DB_PASSWORD \
     WORDPRESS_DB_NAME \
@@ -183,6 +189,121 @@ else
     echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} ${COLOR_CYAN}No themes${COLOR_RESET} to install."
 fi
 
+# Check development deploy wanted
+if [[ "${NPP_DEV_ENABLED}" -eq 1 ]]; then
+    # Set variables
+    PLUGIN_NAME="${NPP_DEV_PLUGIN_NAME}"
+    PLUGIN_DIR="${NPP_DEV_PLUGIN_DIR}"
+    TMP_CLONE_DIR="${NPP_DEV_TMP_CLONE_DIR}"
+    PLUGIN_FILE="${NPP_DEV_PLUGIN_FILE}"
+    GITHUB_REPO="${NPP_DEV_GITHUB_REPO}"
+
+    # -----------------------------------------------------------------------------
+    # 1. Fetch latest development branch details from GitHub
+    # -----------------------------------------------------------------------------
+    TARGET_BRANCH=$(git ls-remote --heads "${GITHUB_REPO}" \
+        | awk '{print $2}' \
+        | sed 's#refs/heads/##' \
+        | grep '^v[0-9]' \
+        | sort -V \
+        | tail -n1 \
+        | awk '{$1=$1;print}')
+
+    LATEST_VERSION="${TARGET_BRANCH#v}"
+    REMOTE_COMMIT_HASH=$(git ls-remote --heads "${GITHUB_REPO}" "refs/heads/${TARGET_BRANCH}" \
+      | awk '{print substr($1,1,7)}' | awk '{$1=$1;print}')
+
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Latest branch: ${COLOR_CYAN}${TARGET_BRANCH}${COLOR_RESET}"
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Latest dev version: ${COLOR_CYAN}${LATEST_VERSION}${COLOR_RESET}"
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Remote commit: ${COLOR_CYAN}${REMOTE_COMMIT_HASH}${COLOR_RESET}"
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} ${COLOR_LIGHT_CYAN}######################${COLOR_RESET}"
+
+    # -----------------------------------------------------------------------------
+    # 2. Retrieve the installed plugin version and commit hash
+    # -----------------------------------------------------------------------------
+    CURRENT_VERSION="0.0.0"
+    INSTALLED_COMMIT_HASH=""
+
+    if [[ -f "${PLUGIN_FILE}" ]]; then
+        CURRENT_VERSION=$(grep -i "Version:" "${PLUGIN_FILE}" | head -n1 | awk '{print $NF}' | awk '{$1=$1;print}')
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Local version: ${COLOR_CYAN}${CURRENT_VERSION}${COLOR_RESET}"
+        if grep -qi "Latest Commit:" "${PLUGIN_FILE}"; then
+            INSTALLED_COMMIT_HASH=$(grep -i "Latest Commit:" "${PLUGIN_FILE}" | head -n1 | awk '{print $NF}' | awk '{$1=$1;print}')
+            echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Local commit: ${COLOR_CYAN}${INSTALLED_COMMIT_HASH}${COLOR_RESET}"
+        else
+            echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} ${COLOR_CYAN}No commit history${COLOR_RESET} in plugin header."
+        fi
+    else
+        echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Plugin not installed; proceeding with fresh deployment."
+    fi
+
+    # -----------------------------------------------------------------------------
+    # 3. Determine if an update is required
+    # -----------------------------------------------------------------------------
+    need_update=0
+
+    if [[ -f "${PLUGIN_FILE}" ]]; then
+        # Check for version mismatch (installed version is older than latest)
+        if [[ "${CURRENT_VERSION}" != "${LATEST_VERSION}" && \
+              "$(echo -e "${CURRENT_VERSION}\n${LATEST_VERSION}" | sort -V | head -n1)" != "${LATEST_VERSION}" ]]; then
+            echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Version discrepancy found..."
+            need_update=1
+        fi
+
+        # Check for commit hash mismatch
+        if [[ "${INSTALLED_COMMIT_HASH}" != "${REMOTE_COMMIT_HASH}" ]]; then
+            echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Commit hash discrepancy found..."
+            need_update=1
+        fi
+    else
+        need_update=1
+    fi
+
+    # -----------------------------------------------------------------------------
+    # 4. Deploy/update the plugin if required
+    # -----------------------------------------------------------------------------
+    if [[ "${need_update}" -eq 1 ]]; then
+        echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Deploying development build ${COLOR_CYAN}${LATEST_VERSION}${COLOR_RESET}..."
+
+        # Remove the current plugin directory (if it exists)
+        rm -rf "${PLUGIN_DIR:?}"
+
+        # Clone the target branch into a temporary directory
+        mkdir -p "${TMP_CLONE_DIR:?}" && cd "${TMP_CLONE_DIR:?}"
+        git clone --branch "${TARGET_BRANCH:?}" "${GITHUB_REPO:?}" . >/dev/null 2>&1
+
+        # Fix line-ending issues
+        find "${TMP_CLONE_DIR:?}" -type f -exec dos2unix {} + >/dev/null 2>&1
+
+        # Retrieve the commit hash from the clone
+        CLONED_COMMIT_HASH=$(git rev-parse --short HEAD)
+
+        # Move the cloned files to the plugin directory and clean up
+        mv "${TMP_CLONE_DIR:?}" "${PLUGIN_DIR:?}"
+        rm -rf "${TMP_CLONE_DIR:?}" >/dev/null 2>&1
+        rm -rf "${PLUGIN_DIR:?}/.git" >/dev/null 2>&1
+        rm -f "${PLUGIN_DIR:?}/README.md" "${PLUGIN_DIR:?}/version" >/dev/null 2>&1
+
+        # Update the plugin header: Version and Latest Commit
+        if [[ -f "${PLUGIN_FILE}" ]]; then
+            sed -i "s/^\(\s*\*\s*Version:\s*\).*$/\1${LATEST_VERSION}/" "${PLUGIN_FILE}"
+            if grep -qi "Latest Commit:" "${PLUGIN_FILE}"; then
+                sed -i "s/^\(\s*\*\s*Latest Commit:\s*\).*$/\1${CLONED_COMMIT_HASH}/" "${PLUGIN_FILE}"
+                echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Updated plugin header commit hash to ${COLOR_CYAN}${CLONED_COMMIT_HASH}${COLOR_RESET}"
+            else
+                sed -i "/Version:/a \ * Latest Commit:     ${CLONED_COMMIT_HASH}" "${PLUGIN_FILE}"
+                echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Added commit hash ${COLOR_CYAN}${CLONED_COMMIT_HASH}${COLOR_RESET} to plugin header."
+            fi
+        fi
+
+        # Adjust ownership (ensure NPP_USER is set in the environment)
+        chown -R "${NPP_USER}":"${NPP_USER}" "${PLUGIN_DIR}"
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Deployed build ${COLOR_CYAN}${TARGET_BRANCH}${COLOR_RESET} with (commit ${COLOR_CYAN}${CLONED_COMMIT_HASH}${COLOR_RESET})."
+    else
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Plugin is up-to-date with commit ${COLOR_CYAN}${REMOTE_COMMIT_HASH}${COLOR_RESET}."
+    fi
+fi
+
 # Listen on dummy port for 'nginx' container health check
 echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Starting to listen on dummy port ${COLOR_CYAN}9999${COLOR_RESET}..."
 if ! nc -zv 127.0.0.1 9999 2>/dev/null; then
