Various un-breaking
This commit is contained in:
parent
0ac4c51b3b
commit
21babc7bca
|
@ -12,7 +12,7 @@ export LETS_ENCRYPT_ENV=production
|
||||||
export DB_ROOT_PASSWORD_VERSION=v1
|
export DB_ROOT_PASSWORD_VERSION=v1
|
||||||
export DB_PASSWORD_VERSION=v1
|
export DB_PASSWORD_VERSION=v1
|
||||||
export PHP_UPLOADS_CONF_VERSION=v1
|
export PHP_UPLOADS_CONF_VERSION=v1
|
||||||
export ENTRYPOINT_CONF_VERSION=v1
|
export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
|
||||||
|
|
||||||
# Multisite
|
# Multisite
|
||||||
#export WORDPRESS_CONFIG_EXTRA="\
|
#export WORDPRESS_CONFIG_EXTRA="\
|
||||||
|
|
|
@ -7,8 +7,6 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- SMTP_HOST=${SMTP_HOST}
|
- SMTP_HOST=${SMTP_HOST}
|
||||||
- MAIL_FROM=${MAIL_FROM}
|
- MAIL_FROM=${MAIL_FROM}
|
||||||
networks:
|
|
||||||
- mail
|
|
||||||
configs:
|
configs:
|
||||||
- source: mstmp_conf
|
- source: mstmp_conf
|
||||||
target: /etc/msmtprc
|
target: /etc/msmtprc
|
||||||
|
@ -16,10 +14,6 @@ services:
|
||||||
target: /docker-entrypoint.mailrelay.sh
|
target: /docker-entrypoint.mailrelay.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
|
||||||
networks:
|
|
||||||
mail:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
mstmp_conf:
|
mstmp_conf:
|
||||||
name: ${STACK_NAME}_mstmp_conf_${MSMTP_CONF_VERSION}
|
name: ${STACK_NAME}_mstmp_conf_${MSMTP_CONF_VERSION}
|
||||||
|
|
|
@ -3,5 +3,3 @@
|
||||||
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y msmtp && rm -rf /var/lib/apt/lists/*
|
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y msmtp && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
echo "sendmail_path = /usr/bin/msmtp -t -i" > /usr/local/etc/php/conf.d/sendmail.ini
|
echo "sendmail_path = /usr/bin/msmtp -t -i" > /usr/local/etc/php/conf.d/sendmail.ini
|
||||||
|
|
||||||
/docker-entrypoint.sh "$@"
|
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
{{ if (env "PHP_EXTENSIONS") }}
|
||||||
docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
|
docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
if [ -n "$@" ]; then
|
||||||
|
"$@"
|
||||||
|
fi
|
||||||
|
|
||||||
# Upstream ENTRYPOINT
|
# Upstream ENTRYPOINT
|
||||||
# https://github.com/docker-library/wordpress/blob/master/php7.4/apache/Dockerfile#L120
|
# https://github.com/docker-library/wordpress/blob/master/php7.4/apache/Dockerfile#L120
|
||||||
/usr/local/bin/docker-entrypoint.sh apache2-foreground "$@"
|
/usr/local/bin/docker-entrypoint.sh apache2-foreground
|
||||||
|
|
Loading…
Reference in New Issue