Update landing-pure-react-code.tsx

website/src/refine-theme/landing-pure-react-code.tsx

@@ -196,7 +196,7 @@ const code = `
 services:
 
   uptimekuma:
-    image: louislam/uptime-kum:${UPTIMEKUMA_VERSION:-1}
+    image: louislam/uptime-kum:${UPTIMEKUMA_VERSION}
     container_name: uptimekuma
     volumes:
       - ./data:/app/data
@@ -212,7 +212,7 @@ services:
       - www
 
   openresty:
-    image: openresty/openresty:${OPENRESTY_VERSION:-bullseye-fat}
+    image: openresty/openresty:${OPENRESTY_VERSION}
     container_name: openresty
     restart: always
     ports:
@@ -228,20 +228,20 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${OPENRESTY_CPU:-0.5}"
+          cpus: "${OPENRESTY_CPU}"
-          memory: "${OPENRESTY_RAM:-0.5G}"   
+          memory: "${OPENRESTY_RAM}"   
           pids: 100
     depends_on:
-      - "php-fpm-${DEFAULT_PHP_VERSION:-8.2}"
+      - "php-fpm-${DEFAULT_PHP_VERSION}"
     networks:
       - www
 
   nginx:
-    image: nginx:${NGINX_VERSION:-latest}
+    image: nginx:${NGINX_VERSION}
     container_name: nginx
     restart: always
     ports:
-      - "${PROXY_HTTP_PORT:-${HTTP_PORT}}"
+      - "${PROXY_HTTP_PORT}"
       - "${HTTPS_PORT}"
     working_dir: /var/www/html
     volumes:
@@ -253,21 +253,21 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${NGINX_CPU:-0.5}"
+          cpus: "${NGINX_CPU}"
-          memory: "${NGINX_RAM:-0.5G}"   
+          memory: "${NGINX_RAM}"   
           pids: 100
     depends_on:
-      - "php-fpm-${DEFAULT_PHP_VERSION:-8.2}"
+      - "php-fpm-${DEFAULT_PHP_VERSION}"
     networks:
       - www
 
 
   apache:
-    image: httpd:${APACHE_VERSION:-latest}
+    image: httpd:${APACHE_VERSION}
     container_name: apache
     restart: always
     ports:
-      - "${PROXY_HTTP_PORT:-${HTTP_PORT}}"
+      - "${PROXY_HTTP_PORT}"
       - "${HTTPS_PORT}"
     working_dir: /var/www/html
     volumes:
@@ -279,21 +279,20 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${APACHE_CPU:-0.5}"
+          cpus: "${APACHE_CPU}"
-          memory: "${APACHE_RAM:-0.5G}"
+          memory: "${APACHE_RAM}"
           pids: 100
     depends_on:
-      - "php-fpm-${DEFAULT_PHP_VERSION:-8.2}"
+      - "php-fpm-${DEFAULT_PHP_VERSION}"
     networks:
       - www
 
   varnish:
-    image: varnish:${VARNISH_VERSION:-stable}
+    image: varnish:${VARNISH_VERSIONe}
     container_name: varnish
     environment:
-      WEB_SERVER: "${WEB_SERVER:-nginx}"
+      WEB_SERVER: "${WEB_SERVER}"
-      VARNISH_SIZE: "${VARNISH_SIZE:-1G}"
+      VARNISH_SIZE: "${VARNISH_SIZE}"
-    entrypoint: /bin/sh -c "cp /etc/varnish/default.vcl.template /etc/varnish/default.vcl && sed -i 's|VARNISH_BACKEND_HOST|'"$WEB_SERVER"'|g' /etc/varnish/default.vcl && /usr/local/bin/docker-varnish-entrypoint"
     command: [ "-n", "/var/lib/varnish" ]
     volumes:
       - ./default.vcl:/etc/varnish/default.vcl.template:ro  
@@ -304,10 +303,10 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${VARNISH_CPU:-0.5}"
+          cpus: "${VARNISH_CPU"
-          memory: "${VARNISH_RAM:-0.5G}"       
+          memory: "${VARNISH_RAM"       
     depends_on:
-      - "${WEB_SERVER:-nginx}"
+      - "${WEB_SERVER}"
     networks:
       - www
 
@@ -321,16 +320,16 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${CRON_CPU:-0.5}"
+          cpus: "${CRON_CPU}"
-          memory: "${CRON_RAM:-0.5G}"
+          memory: "${CRON_RAM}"
           pids: 100
           
   mysql:
-    image: mysql:${MYSQL_VERSION:-latest}
+    image: mysql:${MYSQL_VERSION}
     container_name: mysql
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     ports:
       - "${MYSQL_PORT}"     
     volumes:
@@ -346,8 +345,8 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${MYSQL_CPU:-0.5}"
+          cpus: "${MYSQL_CPU"
-          memory: "${MYSQL_RAM:-0.5G}"
+          memory: "${MYSQL_RAM}"
           pids: 100
     networks:
       - db
@@ -358,11 +357,11 @@ services:
       retries: 10
 
   mariadb:
-    image: mariadb:${MYSQL_VERSION:-latest}
+    image: mariadb:${MYSQL_VERSION}
     container_name: mariadb
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     ports:
       - "${MYSQL_PORT}"
     volumes:
@@ -378,8 +377,8 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${MARIADB_CPU:-0.5}"
+          cpus: "${MARIADB_CPU}"
-          memory: "${MARIADB_RAM:-0.5G}"
+          memory: "${MARIADB_RAM}"
           pids: 100
     networks:
       - db
@@ -392,7 +391,7 @@ services:
   phpmyadmin:
     container_name: phpmyadmin 
     depends_on:
-      - "${MYSQL_TYPE:-mysql}"
+      - "${MYSQL_TYPE"
     image: phpmyadmin
     restart: always
     volumes:
@@ -402,115 +401,30 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${PMA_CPU:-0.1}"
+          cpus: "${PMA_CPU}"
-          memory: "${PMA_RAM:-0.1G}"                
+          memory: "${PMA_RAM}"                
           pids: 100
     environment:
-      PMA_HOST: ${MYSQL_TYPE:-mysql}
+      PMA_HOST: ${MYSQL_TYPE}
-      MAX_EXECUTION_TIME: ${PMA_MAX_EXECUTION_TIME:-600}
-      MEMORY_LIMIT: ${PMA_MEMORY_LIMIT:-512M}
-      UPLOAD_LIMIT: ${PMA_UPLOAD_LIMIT:-256M}
       PMA_UPLOADDIR: "/html/"
       PMA_SAVEDIR: "/html/"
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-    networks:
-      - db
-
-
-
-
-  mssql:
-    image: ${MSSQL_IMAGE}:${MSSQL_VERSION:-latest}
-    container_name: mssql
-    restart: always
-    environment:
-      ACCEPT_EULA: "Y"
-      MSSQL_SA_PASSWORD: ${MSSQL_SA_PASSWORD:-StrongPassword!}
-      MSSQL_PID: ${MSSQL_PID:-Developer}
-    ports:
-      - "${MSSQL_PORT}"
-    volumes:
-      - mssql_data:/var/opt/mssql
-      - ./sockets/mssql:/var/opt/mssql/sockets
-      - ./mssql.conf:/etc/mssql/mssql.conf:ro
-    deploy:
-      resources:
-        limits:
-          cpus: "${MSSQL_CPU:-1}"
-          memory: "${MSSQL_RAM:-2G}"
-          pids: 100
-    networks:
-      - db
-    healthcheck:
-      test: ['CMD-SHELL', 'sqlcmd -S localhost -U sa -P "$$MSSQL_SA_PASSWORD" -Q "SELECT 1" || exit 1']
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      
-
-
-  postgres:
-    image: postgres:${POSTGRES_VERSION:-latest}
-    container_name: postgres
-    restart: always
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER:-postgres}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgrespassword}
-    ports:
-      - "${POSTGRES_PORT}"
-    volumes:
-      - pg_data:/var/lib/postgresql/data
-      - ./sockets/postgres:/var/run/postgresql
-    deploy:
-      resources:
-        limits:
-          cpus: "${POSTGRES_CPU:-0.3}"
-          memory: "${POSTGRES_RAM:-0.3}"
-          pids: 100
-    networks:
-      - db
-    healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER:-postgres}']
-      interval: 1s
-      timeout: 5s
-      retries: 10
-      
-
-  pgadmin:
-    container_name: pgadmin
-    image: dpage/pgadmin4:${PGADMIN_VERSION:-latest}
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_MAIL}
-      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PW}
-    depends_on:
-      - "postgres"
-    ports:
-      #- "5050:80"
-      - "${PGADMIN_PORT}"
-    restart: always
-    deploy:
-      resources:
-        limits:
-          cpus: "${PGADMIN_CPU:-0.1}"
-          memory: "${PGADMIN_RAM:-0.1}"
-          pids: 100
     networks:
       - db
 
 
   redis:
-    image: redis:${REDIS_VERSION:-7.4.2-alpine}
+    image: redis:${REDIS_VERSION}
     container_name: redis
     restart: unless-stopped
-    user: "${USER_ID:-0}"
     command: ["redis-server", "--bind", "0.0.0.0", "--port", "6379"]
     volumes:
       - ./sockets/redis:/var/run/redis  # Redis socket
     deploy:
       resources:
         limits:
-          cpus: "${REDIS_CPU:-0.1}"
+          cpus: "${REDIS_CP}"
-          memory: "${REDIS_RAM-0.1G}" 
+          memory: "${REDIS_RAM}" 
           pids: 100
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
@@ -521,82 +435,6 @@ services:
     networks:
       - www
 
-
-  elasticsearch:
-    image: elasticsearch:${ELASTICSEARH_VERSION:-7.16.1}
-    container_name: elasticsearch
-    restart: unless-stopped
-    user: "${USER_ID:-0}"
-    environment:
-      discovery.type: single-node
-      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
-    volumes:
-      - ./sockets/elasticsearch:/var/run/elasticsearch
-    deploy:
-      resources:
-        limits:
-          cpus: "${ELASTICSEARCH_CPU:-0.5}"
-          memory: "${ELASTICSEARCH_RAM-1G}" 
-          pids: 100
-    healthcheck:
-      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-      interval: 10s
-      timeout: 10s
-      retries: 3
-    networks:
-      - www
-
-
-  opensearch:
-    image: opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.11.0}
-    container_name: opensearch
-    restart: unless-stopped
-    environment:
-      discovery.type: single-node
-      OPENSEARCH_JAVA_OPTS: "-Xms512m -Xmx512m"
-      DISABLE_SECURITY_PLUGIN: "true"
-      OPENSEARCH_INITIAL_ADMIN_PASSWORD: "${OPENSEARCH_INITIAL_ADMIN_PASSWORD:-iIybFJOgznCYmpOO}"
-      DISABLE_INSTALL_DEMO_CONFIG: "true"
-    volumes:
-      - ./sockets/opensearch:/var/run/opensearch
-    deploy:
-      resources:
-        limits:
-          cpus: "${OPENSEARCH_CPU:-0.5}"
-          memory: "${OPENSEARCH_RAM:-1G}" 
-          pids: 100
-    healthcheck:
-      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-      interval: 10s
-      timeout: 10s
-      retries: 3
-    networks:
-      - www
-  
-  memcached:
-    image: memcached:${MEMCACHED_VERSION:-7.4.2-alpine}
-    container_name: memcached
-    restart: unless-stopped
-    user: "${USER_ID:-0}"
-    command: ["memcached", "-u", "root", "-l", "0.0.0.0", "-p", "11211"]
-    volumes:
-      - ./sockets/memcached:/var/run/  # Memcached socket
-    deploy:
-      resources:
-        limits:
-          cpus: "${MEMCACHED_CPU:-0.1}"
-          memory: "${MEMCACHED_RAM-0.1G}" 
-          pids: 100
-    healthcheck:
-      test: ["CMD", "memcached", "-h"]
-      interval: 30s
-      retries: 3
-      start_period: 10s
-      timeout: 5s
-    networks:
-      - www
-
-
   php-fpm-5.6:
     image: shinsenter/php:5.6-fpm
     container_name: php-fpm-5.6
@@ -606,330 +444,16 @@ services:
       - ./php.ini/5.6.ini:/usr/local/etc/php/php.ini
       - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
     environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_5_6_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_5_6_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_5_6_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_5_6_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_5_6_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_5_6_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_5_6_PHP_UPLOAD_MAX_FILESIZE:-256M}   
       - APP_USER=root
       - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
+      - APP_UID=${USER_ID}
-      - APP_GID=${USER_ID:-0}
+      - APP_GID=${USER_ID}
       - ENABLE_TUNING_FPM=1
     deploy:
       resources:
         limits:
-          cpus: "${PHP_FPM_5_6_CPU:-0.125}"
+          cpus: "${PHP_FPM_5_6_CPU}"
-          memory: "${PHP_FPM_5_6_RAM:-0.25G}"
+          memory: "${PHP_FPM_5_6_RAM}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"    
-
-  php-fpm-7.0:
-    image: shinsenter/php:7.0-fpm
-    container_name: php-fpm-7.0
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/7.0.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_7_0_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_7_0_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_7_0_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_7_0_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_7_0_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_7_0_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_7_0_PHP_UPLOAD_MAX_FILESIZE:-256M}  
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_7_0_CPU:-0.125}"
-          memory: "${PHP_FPM_7_0_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"   
-      
-  php-fpm-7.1:
-    image: shinsenter/php:7.1-fpm
-    container_name: php-fpm-7.1
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/7.1.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_7_1_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_7_1_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_7_1_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_7_1_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_7_1_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_7_1_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_7_1_PHP_UPLOAD_MAX_FILESIZE:-256M}
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_7_1_CPU:-0.125}"
-          memory: "${PHP_FPM_7_1_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"   
-      
-
-  php-fpm-7.2:
-    image: shinsenter/php:7.2-fpm
-    container_name: php-fpm-7.2
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/7.2.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_7_2_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_7_2_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_7_2_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_7_2_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_7_2_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_7_2_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_7_2_PHP_UPLOAD_MAX_FILESIZE:-256M}
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_7_2_CPU:-0.125}"
-          memory: "${PHP_FPM_7_2_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"
-      
-
-
-  php-fpm-7.3:
-    image: shinsenter/php:7.3-fpm
-    container_name: php-fpm-7.3
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/7.3.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_7_3_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_7_3_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_7_3_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_7_3_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_7_3_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_7_3_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_7_3_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_7_3_CPU:-0.125}"
-          memory: "${PHP_FPM_7_3_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root" 
-      
-
-  php-fpm-7.4:
-    image: shinsenter/php:7.4-fpm
-    container_name: php-fpm-7.4
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/7.4/:/usr/local/etc/php
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_7_4_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_7_4_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_7_4_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_7_4_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_7_4_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_7_4_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_7_4_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_7_4_CPU:-0.125}"
-          memory: "${PHP_FPM_7_4_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root" 
-      
-  php-fpm-8.0:
-    image: shinsenter/php:8.0-fpm
-    container_name: php-fpm-8.0
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/8.0.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_8_0_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_8_0_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_8_0_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_8_0_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_8_0_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_8_0_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_8_0_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_8_0_CPU:-0.125}"
-          memory: "${PHP_FPM_8_0_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"
-   
-      
-
-  php-fpm-8.1:
-    image: shinsenter/php:8.1-fpm
-    container_name: php-fpm-8.1
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/8.1.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_8_1_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_8_1_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_8_1_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_8_1_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_8_1_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_8_1_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_8_1_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_8_1_CPU:-0.125}"
-          memory: "${PHP_FPM_8_1_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"
-  
-
-      
-  php-fpm-8.2:
-    image: shinsenter/php:8.2-fpm
-    container_name: php-fpm-8.2
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/8.2.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp
-      - ./ioncube/ioncube_loader_lin_8.2.so:/usr/local/lib/php/extensions/no-debug-non-zts-20220829/ioncube_loader.so
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_8_2_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_8_2_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_8_2_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_8_2_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_8_2_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_8_2_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_8_2_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_8_2_CPU:-0.125}"
-          memory: "${PHP_FPM_8_2_RAM:-0.25G}"
-          pids: 100
-    networks:
-      - www
-      - db
-    command: >
-      sh -c "php-fpm --allow-to-run-as-root"
-      
-
-  php-fpm-8.3:
-    image: shinsenter/php:8.3-fpm
-    container_name: php-fpm-8.3
-    restart: always
-    volumes:
-      - html_data:/var/www/html/
-      - ./php.ini/8.3.ini:/usr/local/etc/php/php.ini
-      - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp
-    environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_8_3_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_8_3_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_8_3_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_8_3_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_8_3_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_8_3_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_8_3_PHP_UPLOAD_MAX_FILESIZE:-256M} 
-      - APP_USER=root
-      - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
-      - APP_GID=${USER_ID:-0}
-      - ENABLE_TUNING_FPM=1
-    deploy:
-      resources:
-        limits:
-          cpus: "${PHP_FPM_8_3_CPU:-0.125}"
-          memory: "${PHP_FPM_8_3_RAM:-0.25G}"
           pids: 100
     networks:
       - www
@@ -946,23 +470,16 @@ services:
       - ./php.ini/8.4.ini:/usr/local/etc/php/php.ini
       - /etc/openpanel/wordpress/wp-cli.phar:/usr/local/bin/wp  
     environment:
-      - PHP_ENABLE_OPCACHE=${PHP_FPM_8_4_ENABLE_OPCACHE:-true}
-      - PHP_MAX_EXECUTION_TIME=${PHP_FPM_8_4_PHP_MAX_EXECUTION_TIME:-600}
-      - PHP_MAX_INPUT_TIME=${PHP_FPM_8_4_PHP_MAX_INPUT_TIME:-600}
-      - PHP_MAX_INPUT_VARS=${PHP_FPM_8_4_PHP_MAX_INPUT_VARS:-1000}
-      - PHP_MEMORY_LIMIT=${PHP_FPM_8_4_PHP_MEMORY_LIMIT:-512M}
-      - PHP_POST_MAX_SIZE=${PHP_FPM_8_4_PHP_POST_MAX_SIZE:-512M}
-      - PHP_UPLOAD_MAX_FILESIZE=${PHP_FPM_8_4_PHP_UPLOAD_MAX_FILESIZE:-256M}
       - APP_USER=root
       - APP_GROUP=root
-      - APP_UID=${USER_ID:-0}
+      - APP_UID=${USER_ID}
-      - APP_GID=${USER_ID:-0}
+      - APP_GID=${USER_ID}
       - ENABLE_TUNING_FPM=1
     deploy:
       resources:
         limits:
-          cpus: "${PHP_FPM_8_4_CPU:-0.125}"
+          cpus: "${PHP_FPM_8_4_CPU}"
-          memory: "${PHP_FPM_8_4_RAM:-0.25G}"
+          memory: "${PHP_FPM_8_4_RAM}"
           pids: 100
     networks:
       - www
@@ -989,30 +506,30 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "${BACKUP_CPU:-1.0}"
+          cpus: "${BACKUP_CPU}"
-          memory: "${BACKUP_RAM:-1.0g}"
+          memory: "${BACKUP_RAM}"
           pids: 100
     command: [ "backup" ]
     restart: unless-stopped
       
   minecraft:
-    image: itzg/minecraft-server:${MINECRAFT_VERSION:-latest}
+    image: itzg/minecraft-server:${MINECRAFT_VERSION}
     container_name: minecraft
     tty: true
     stdin_open: true
     ports:
-      - "${MINECRAFT_PORT:-25565}:25565"
+      - "${MINECRAFT_PORT}:25565"
     environment:
       EULA: "TRUE"
-      ENABLE_QUERY: "${MINECRAFT_ENABLE_QUERY:-true}"
+      ENABLE_QUERY: "${MINECRAFT_ENABLE_QUERY}"
-      QUERY_PORT: "${MINECRAFT_PORT:-25565}"
+      QUERY_PORT: "${MINECRAFT_PORT}"
     volumes:
       - mc_data:/data
     deploy:
       resources:
         limits:
-          cpus: "${MINECRAFT_CPU:-1.0}"
+          cpus: "${MINECRAFT_CPU}"
-          memory: "${MINECRAFT_RAM:-1.0G}"
+          memory: "${MINECRAFT_RAM}"
           pids: 100
     healthcheck:
       test: mc-health