Commit 55745b89 authored by Jon Pugh's avatar Jon Pugh

Merge branch '4.x-docker-compose' of github.com:aegir-project/provision into 4.x-docker-compose

parents 654dff8a 4b4f86ac
......@@ -17,7 +17,7 @@ tree /etc/apache2
# Add symlink from our server's config to the apache include target.
echo "𝙋𝙍𝙊 ║ Checking folder $AEGIR_ROOT/config"
tree $AEGIR_ROOT
tree $AEGIR_ROOT/config
# If there are no platforms assigned to the server, docker.conf and the docker config folders are never created.
#if [ ! -f '$AEGIR_ROOT/config/$AEGIR_SERVER_NAME/apacheDocker.conf' ]; then
......
......@@ -61,7 +61,13 @@ class HttpApacheDockerService extends HttpApacheService implements DockerService
* @return string
*/
public static function apache_restart_cmd() {
return 'docker-compose exec http sudo apache2ctl graceful';
// return 'docker-compose exec http sudo apache2ctl graceful';
// @TODO: restarting apache gracefully results in zero downtime, but we need to restart the
// container to ensure volumes are mounted properly. If the root folder of the platform is deleted,
// docker will not see a new folder in that path in it's place. The container must restart to
// see the volume path.
return 'docker-compose restart http';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment