diff --git a/compose.yml b/compose.yml index d206b69..f9f9b2c 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: - backend: - image: adhocore/phpfpm:8.0 + app: + image: php:8.0-fpm-alpine3.13 volumes: - "site_content:/var/www/html/" networks: @@ -28,14 +28,14 @@ services: failure_action: rollback order: start-first labels: - - coop-cloud.${STACK_NAME}.backend.version=8.0-92fac7ac + - coop-cloud.${STACK_NAME}.app.version=8.0-92fac7ac frontend: image: nginx:1.19.2 networks: - internal - proxy depends_on: - - backend + - app deploy: restart_policy: condition: on-failure @@ -99,7 +99,7 @@ configs: template_driver: golang nginx_default_conf: name: ${STACK_NAME}_nginx_default_conf_${NGINX_DEFAULT_CONF_VERSION} - file: default.conf + file: nginx.conf php_uploads_conf: name: ${STACK_NAME}_php_uploads_conf_${PHP_UPLOADS_CONF_VERSION} file: uploads.ini diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 2aa409a..11d93f7 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -1,9 +1,10 @@ #!/bin/bash -{{ if (env "PHP_EXTENSIONS_TO_DISABLE") }} -docker-php-ext-disable {{ env "PHP_EXTENSIONS_TO_DISABLE" }} +{{ if (env "PHP_EXTENSIONS") }} +docker-php-ext-install {{ env "PHP_EXTENSIONS" }} {{ end }} if [ -n "$@" ]; then "$@" fi + diff --git a/default.conf b/nginx.conf similarity index 97% rename from default.conf rename to nginx.conf index 3e0a265..4f7b9a1 100644 --- a/default.conf +++ b/nginx.conf @@ -33,7 +33,7 @@ server { location ~ \.php$ { try_files $uri = 404; #root html; - fastcgi_pass backend:9000; + fastcgi_pass app:9000; fastcgi_index index.php; fastcgi_split_path_info ^(.+\.php)(/.+)$; include fastcgi_params;