diff --git a/docker-compose.yml b/docker-compose.yml index 564f64b..47d846c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,13 +61,11 @@ services: ports: - '80:80' - '443:443' - - '81:81' + - '90:90' links: - joomla environment: TZ: '${LOCAL_TIMEZONE}' - labels: - - "docker-volume-backup.stop-during-backup=true" command: bash -c "sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${HTTPD_PREFIX}/conf'" certbot: @@ -121,15 +119,13 @@ services: # - database environment: #PMA_HOST: database - PMA_PMADB: phpmyadmin + PMA_PMADB: 'phpmyadmin' PMA_CONTROLUSER: '${PMA_CONTROLUSER}' PMA_CONTROLPASS: '${PMA_CONTROLPASS}' MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}' UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}' MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}' TZ: '${LOCAL_TIMEZONE}' - labels: - - "docker-volume-backup.stop-during-backup=true" command: > bash -c "echo ${PMA_HTPASSWD_USERNAME}:phpmyadmin:$$( printf \"%s:%s:%s\" \"${PMA_HTPASSWD_USERNAME}\" \"phpmyadmin\" \"${PMA_HTPASSWD_PASSWORD}\" | md5sum | awk '{print $$1}' ) > ${PMA_CONF_FOLDER}/.htpasswd && printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest; @@ -182,8 +178,6 @@ services: environment: ALLOW_EMPTY_PASSWORD: 'yes' TZ: '${LOCAL_TIMEZONE}' - labels: - - "docker-volume-backup.stop-during-backup=true" command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf" varnish: @@ -204,8 +198,6 @@ services: environment: VARNISH_SIZE: '${VARNISH_SIZE}' TZ: '${LOCAL_TIMEZONE}' - labels: - - "docker-volume-backup.stop-during-backup=true" command: "-a http=:8080,HTTP -p default_ttl=3600" backup: