Various un-breaking
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
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_PASSWORD_VERSION=v1
|
||||
export PHP_UPLOADS_CONF_VERSION=v1
|
||||
export ENTRYPOINT_CONF_VERSION=v1
|
||||
export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
|
||||
|
||||
# Multisite
|
||||
#export WORDPRESS_CONFIG_EXTRA="\
|
||||
|
|
|
@ -7,8 +7,6 @@ services:
|
|||
environment:
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- MAIL_FROM=${MAIL_FROM}
|
||||
networks:
|
||||
- mail
|
||||
configs:
|
||||
- source: mstmp_conf
|
||||
target: /etc/msmtprc
|
||||
|
@ -16,10 +14,6 @@ services:
|
|||
target: /docker-entrypoint.mailrelay.sh
|
||||
mode: 0555
|
||||
|
||||
networks:
|
||||
mail:
|
||||
external: true
|
||||
|
||||
configs:
|
||||
mstmp_conf:
|
||||
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/*
|
||||
|
||||
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
|
||||
|
||||
{{ if (env "PHP_EXTENSIONS") }}
|
||||
docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
|
||||
{{ end }}
|
||||
|
||||
if [ -n "$@" ]; then
|
||||
"$@"
|
||||
fi
|
||||
|
||||
# Upstream ENTRYPOINT
|
||||
# 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