Make docker-compose load specific env files per environment

Because of a change in docker-compose, which always read and parses the
.env file in the root, the .env file was parsed incorrectly.
Since we don't even need docker-compose to load the .env file, we
override that in the cli command by specifying an env file.

Author: hgraca

Diff for: Makefile

@@ -128,23 +128,22 @@ shell:
 
 test:
 	- ENV='tst' ./bin/stop # Just in case some container is left over stopped, as is the case after PHPStorm runs tests
-	ENV='tst' ./bin/run
 	- $(MAKE) cs-fix
 	ENV='tst' ./bin/run php vendor/bin/phpunit
-	ENV='tst' ./bin/stop
+	- ENV='tst' ./bin/stop
 	$(MAKE) test-acc
 	$(MAKE) test-dep
 
 test-acc:
 	- ENV='tst' ./bin/stop # Just in case some container is left over stopped, as is the case after PHPStorm runs tests
 	ENV='tst' ./bin/run make db-setup-guest
-	ENV='tst' docker-compose -f build/container/tst/docker-compose.yml up -d -t 0
+	ENV='tst' docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/tst/docker-compose.yml up -d -t 0
 	php vendor/bin/codecept run -g acceptance
-	ENV='tst' ./bin/stop
+	- ENV='tst' ./bin/stop
 
 test-acc-ci:
 	- ENV='prd' ./bin/stop # Just in case some container is left over stopped, as is the case after PHPStorm runs tests
-	ENV='prd' docker-compose -f build/container/prd/docker-compose.yml up -d -t 0
+	ENV='prd' docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/prd/docker-compose.yml up -d -t 0
 	php vendor/bin/codecept run -g acceptance
 	ENV='prd' ./bin/stop
 
@@ -203,11 +202,11 @@ test_cov-publish:
 
 up:
 	if [ ! -f ${DB_PATH} ]; then $(MAKE) db-setup; fi
-	$(eval UP=ENV=dev docker-compose -f build/container/dev/docker-compose.yml up -t 0)
-	$(eval DOWN=ENV=dev docker-compose -f build/container/dev/docker-compose.yml down -t 0)
+	$(eval UP=ENV=dev docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/dev/docker-compose.yml up -t 0)
+	$(eval DOWN=ENV=dev docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/dev/docker-compose.yml down -t 0)
 	- bash -c "trap '${DOWN}' EXIT; ${UP}"
 
 up-prd:
-	$(eval UP=ENV=prd docker-compose -f build/container/prd/docker-compose.yml up -t 0)
-	$(eval DOWN=ENV=prd docker-compose -f build/container/prd/docker-compose.yml down -t 0)
+	$(eval UP=ENV=prd docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/prd/docker-compose.yml up -t 0)
+	$(eval DOWN=ENV=prd docker-compose --env-file=build/container/${ENV}/docker.env -f build/container/prd/docker-compose.yml down -t 0)
 	- bash -c "trap '${DOWN}' EXIT; ${UP}"

Diff for: bin/run

@@ -24,7 +24,8 @@ $detached = '';
 
 $containerName = 'app.sfn.' . $env;
 $yamlFile = "$rootDir/build/container/$env/docker-compose.yml";
-$downCommand = "docker-compose -f $yamlFile down -t 0"; // we use the "-t 0" so that we don't have a timeout of 10s, needs version >= 1.22
+$envFile = "$rootDir/build/container/$env/docker.env";
+$downCommand = "docker-compose --env-file=$envFile -f $yamlFile down -t 0"; // we use the "-t 0" so that we don't have a timeout of 10s, needs version >= 1.22
 
 if (empty($argumentList) && isContainerRunning($containerName)) {
     exit($returnVal);
@@ -33,13 +34,13 @@ if (empty($argumentList) && isContainerRunning($containerName)) {
 if (empty($argumentList)) {
     // If no command is given to execute, just keep the container running in the background for 1h
     $detached = '-d';
-    $guestCommand =  "sleep 3600";
+    $guestCommand = "sleep 3600";
 } else {
-    $guestCommand =  implode(' ', $argumentList);
+    $guestCommand = implode(' ', $argumentList);
 }
 
 // We wrap the $guestCommand in /bin/sh so that we get the full output if it breaks, ie with a segfault
-$hostCommand = "docker-compose -f $yamlFile run $detached -u $(id -u):$(id -g) --name $containerName app /bin/sh -c '$guestCommand'";
+$hostCommand = "docker-compose --env-file=$envFile -f $yamlFile run $detached -u $(id -u):$(id -g) --name $containerName app /bin/sh -c '$guestCommand'";
 
 if (!$detached) {
     // We wrap the host command in bash trap so that we can trap a signal and destroy the stopped containers

Diff for: bin/stop

@@ -11,16 +11,21 @@ $debug = false;
 
 $env = getenv('ENV') ?: 'dev';
 $rootDir = __DIR__ . '/..';
-$returnVal = 0;
+$downReturnVal = 0;
+$removeReturnVal = 0;
 
 $containerName = 'app.sfn.' . $env;
 $yamlFile = "$rootDir/build/container/$env/docker-compose.yml";
+$envFile = "$rootDir/build/container/$env/docker.env";
 
-$downCommand = "docker-compose -f $yamlFile down -t 0"; // we use the "-t 0" so that we don't have a timeout of 10s, needs version >= 1.22
+$downCommand = "docker-compose --env-file=$envFile -f $yamlFile down -t 0"; // we use the "-t 0" so that we don't have a timeout of 10s, needs version >= 1.22
+$removeCommand = "docker container rm $containerName -f";
 
 if (isContainerExists($containerName)) {
     if ($debug) echo "[DEBUG-STOP] $downCommand \n";
-    system($downCommand, $returnVal);
+    system($downCommand, $downReturnVal);
+    if ($debug) echo "[DEBUG-STOP] $downCommand \n";
+    system($removeCommand, $removeReturnVal);
 }
 
-exit($returnVal);
+exit($downReturnVal + $removeReturnVal);