configurable php version, root_path, fix db host
This commit is contained in:
parent
32d2f3f04f
commit
2e7a8c66f1
|
@ -5,8 +5,13 @@ DOMAIN=example.com
|
||||||
#EXTRA_DOMAINS=', `www.example.com`'
|
#EXTRA_DOMAINS=', `www.example.com`'
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
## Extensions you do NOT need, out of this list of installed extensions: https://github.com/adhocore/docker-phpfpm#php80
|
ROOT_PATH=/var/www/html
|
||||||
#PHP_EXTENSIONS_TO_DISABLE="calendar"
|
PHP_VERSION=7.4
|
||||||
|
# environment for PHP frameworks like laravel/symphony
|
||||||
|
APP_ENV=prod
|
||||||
|
|
||||||
|
## Extra extensions you need
|
||||||
|
#PHP_EXTENSIONS="calendar"
|
||||||
|
|
||||||
# Optional database
|
# Optional database
|
||||||
#COMPOSE_FILE="compose.yml:compose.mariadb.yml"
|
#COMPOSE_FILE="compose.yml:compose.mariadb.yml"
|
||||||
|
|
3
abra.sh
3
abra.sh
|
@ -1,4 +1,5 @@
|
||||||
export NGINX_DEFAULT_CONF_VERSION=v6
|
# export PHP_VERSION=7.4
|
||||||
|
export NGINX_DEFAULT_CONF_VERSION=v7
|
||||||
export PHP_UPLOADS_CONF_VERSION=v3
|
export PHP_UPLOADS_CONF_VERSION=v3
|
||||||
export ENTRYPOINT_CONF_VERSION=v2
|
export ENTRYPOINT_CONF_VERSION=v2
|
||||||
export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
|
export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
|
||||||
|
|
|
@ -2,7 +2,7 @@ version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- DB_HOST=db
|
- DB_HOST=${STACK_NAME}_db
|
||||||
- DB_USER=site
|
- DB_USER=site
|
||||||
- DB_PASSWORD_FILE=/run/secrets/db_password
|
- DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- DB_NAME=site
|
- DB_NAME=site
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: php:8.0-fpm-alpine3.13
|
image: php:${PHP_VERSION}-fpm-alpine3.13
|
||||||
volumes:
|
volumes:
|
||||||
- "site_content:/var/www/html/"
|
- "site_content:/var/www/html/"
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
environment:
|
environment:
|
||||||
- PHP_EXTENSIONS_TO_DISABLE
|
- PHP_EXTENSIONS
|
||||||
|
- APP_ENV
|
||||||
configs:
|
configs:
|
||||||
- source: php_uploads_conf
|
- source: php_uploads_conf
|
||||||
target: /usr/local/etc/php/conf.d/uploads.ini
|
target: /usr/local/etc/php/conf.d/uploads.ini
|
||||||
|
@ -20,7 +21,7 @@ services:
|
||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- coop-cloud.${STACK_NAME}.app.version=8.0-92fac7ac
|
- coop-cloud.${STACK_NAME}.app.version=${PHP_VERSION}-92fac7ac
|
||||||
frontend:
|
frontend:
|
||||||
image: nginx:1.19.2
|
image: nginx:1.19.2
|
||||||
networks:
|
networks:
|
||||||
|
@ -49,6 +50,7 @@ services:
|
||||||
target: /etc/nginx/conf.d/default.conf
|
target: /etc/nginx/conf.d/default.conf
|
||||||
environment:
|
environment:
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
|
- ROOT_PATH
|
||||||
# healthcheck:
|
# healthcheck:
|
||||||
# test: ["CMD", "curl", "-f", "http://localhost"]
|
# test: ["CMD", "curl", "-f", "http://localhost"]
|
||||||
# interval: 30s
|
# interval: 30s
|
||||||
|
|
|
@ -4,7 +4,7 @@ server {
|
||||||
listen [::]:80;
|
listen [::]:80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
|
||||||
root /var/www/html;
|
root {{ env "ROOT_PATH" }};
|
||||||
|
|
||||||
#charset koi8-r;
|
#charset koi8-r;
|
||||||
#access_log /var/log/nginx/host.access.log main;
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
|
Loading…
Reference in New Issue