From 4b2a869191f98701a270813570cf790387cab08f Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Sun, 14 Jun 2020 12:11:05 -0300 Subject: [PATCH 1/6] Update start --- start | 1 + 1 file changed, 1 insertion(+) diff --git a/start b/start index 4028d114d6f..a347fdfe144 100755 --- a/start +++ b/start @@ -1,4 +1,5 @@ #!/usr/bin/env bash +sudo service apache2 stop docker-compose up -d && \ version=$(git describe --tags $(git rev-list --tags --max-count=1)) echo " From 92d8fb27f2ce5a35fd1aeaccdb83fa20db5164b9 Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Sun, 14 Jun 2020 12:12:23 -0300 Subject: [PATCH 2/6] Update docker-compose.yml --- docker-compose.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8bcea16a724..3d86fc7718c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - ./src:/var/www/html - ~/.composer:/var/www/.composer - ~/.npm:/var/www/.npm + - ./apache2/log:/var/log/apache2 # - ~/.nvm:/var/www/.nvm environment: XDEBUG_CONFIG: "remote_host=localhost" @@ -20,7 +21,7 @@ services: links: - db networks: - - -network + - MAGENTO2.3-network db: image: mariadb @@ -34,7 +35,7 @@ services: volumes: - dbdata:/var/lib/mysql networks: - - -network + - MAGENTO2.3-network phpmyadmin: image: phpmyadmin/phpmyadmin @@ -46,21 +47,21 @@ services: ports: - 8080:80 networks: - - -network + - MAGENTO2.3-network redis: image: redis ports: - 6379 networks: - - -network + - MAGENTO2.3-network redis-session: image: redis ports: - 6379 networks: - - -network + - MAGENTO2.3-network mailhog: image: mailhog/mailhog @@ -68,10 +69,10 @@ services: - 1025:1025 - 8025:8025 networks: - - -network + - MAGENTO2.3-network networks: - -network: + MAGENTO2.3-network: driver: bridge volumes: From 06e6bf7e49bccbf57132302af5a7373ae929f543 Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Mon, 15 Jun 2020 01:23:11 -0300 Subject: [PATCH 3/6] Update docker-compose.yml --- docker-compose.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d86fc7718c..8bcea16a724 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,6 @@ services: - ./src:/var/www/html - ~/.composer:/var/www/.composer - ~/.npm:/var/www/.npm - - ./apache2/log:/var/log/apache2 # - ~/.nvm:/var/www/.nvm environment: XDEBUG_CONFIG: "remote_host=localhost" @@ -21,7 +20,7 @@ services: links: - db networks: - - MAGENTO2.3-network + - -network db: image: mariadb @@ -35,7 +34,7 @@ services: volumes: - dbdata:/var/lib/mysql networks: - - MAGENTO2.3-network + - -network phpmyadmin: image: phpmyadmin/phpmyadmin @@ -47,21 +46,21 @@ services: ports: - 8080:80 networks: - - MAGENTO2.3-network + - -network redis: image: redis ports: - 6379 networks: - - MAGENTO2.3-network + - -network redis-session: image: redis ports: - 6379 networks: - - MAGENTO2.3-network + - -network mailhog: image: mailhog/mailhog @@ -69,10 +68,10 @@ services: - 1025:1025 - 8025:8025 networks: - - MAGENTO2.3-network + - -network networks: - MAGENTO2.3-network: + -network: driver: bridge volumes: From 9a3477bba221bf5de08c9319a89fb777411bf857 Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Mon, 15 Jun 2020 01:24:14 -0300 Subject: [PATCH 4/6] Update docker-compose.yml --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 8bcea16a724..98b36e83b6f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - ./src:/var/www/html - ~/.composer:/var/www/.composer - ~/.npm:/var/www/.npm + - ./apache2/log:/var/log/apache2 # - ~/.nvm:/var/www/.nvm environment: XDEBUG_CONFIG: "remote_host=localhost" From 4852788e33db06811b76e12fd1f1430050842353 Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Mon, 15 Jun 2020 01:25:46 -0300 Subject: [PATCH 5/6] Update start --- start | 1 - 1 file changed, 1 deletion(-) diff --git a/start b/start index a347fdfe144..4028d114d6f 100755 --- a/start +++ b/start @@ -1,5 +1,4 @@ #!/usr/bin/env bash -sudo service apache2 stop docker-compose up -d && \ version=$(git describe --tags $(git rev-list --tags --max-count=1)) echo " From e56760972363bba330f87ee98c0494fda320f9da Mon Sep 17 00:00:00 2001 From: Danilo Alexandrino Date: Thu, 18 Jun 2020 14:19:43 -0300 Subject: [PATCH 6/6] Update start --- start | 1 + 1 file changed, 1 insertion(+) diff --git a/start b/start index 4028d114d6f..a347fdfe144 100755 --- a/start +++ b/start @@ -1,4 +1,5 @@ #!/usr/bin/env bash +sudo service apache2 stop docker-compose up -d && \ version=$(git describe --tags $(git rev-list --tags --max-count=1)) echo "