From 8b3a17c54aa2ecba8bcc226c04efc4d6910caeb4 Mon Sep 17 00:00:00 2001
From: Jonathan Crooke <jonathan.crooke@zalando.de>
Date: Wed, 13 Nov 2019 12:08:44 +0100
Subject: [PATCH] Add -test container suffix

---
 hooks/test                                             |  2 +-
 test/bats/helpers.bash                                 |  2 +-
 test/bats/no-ispconfig-ssl.sh                          |  6 +++---
 test/bats/reconfigure.sh                               | 10 +++++-----
 test/bats/tests.sh                                     |  2 +-
 test/default/ispconfig.test.js                         |  2 +-
 test/docker-compose.bats.custom-ssl.test.yml           |  5 +++--
 test/docker-compose.bats.no-ispconfig-ssl.test.yml     |  5 +++--
 test/docker-compose.bats.reconfigure.test.yml          |  5 +++--
 test/docker-compose.bats.test.yml                      |  5 +++--
 test/docker-compose.puppeteer.no-phpmyadmin.test.yml   |  5 +++--
 .../docker-compose.puppeteer.remote-db-seeded.test.yml |  6 +++---
 test/docker-compose.puppeteer.remote-db.test.yml       |  6 +++---
 test/docker-compose.puppeteer.test.yml                 |  4 ++--
 test/no-phpmyadmin/phpmyadmin.test.js                  |  4 ++--
 test/remote-db/ispconfig.test.js                       |  2 +-
 16 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/hooks/test b/hooks/test
index cef0609..ef16f8d 100755
--- a/hooks/test
+++ b/hooks/test
@@ -13,7 +13,7 @@ function buildAndTest() {
   fi
 
   DOWN="docker-compose -f test/$YML down -v"
-  CMD="docker-compose -f test/$YML up --no-build --abort-on-container-exit sut"
+  CMD="docker-compose -f test/$YML up --no-build --abort-on-container-exit --force-recreate --remove-orphans sut"
   if ! $CMD; then
     echo "Failed: \"$CMD\""
     $DOWN &> /dev/null || true
diff --git a/test/bats/helpers.bash b/test/bats/helpers.bash
index b66d82a..e3194fc 100644
--- a/test/bats/helpers.bash
+++ b/test/bats/helpers.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 
-export CONTAINER="ispconfig"
+export CONTAINER="ispconfig-test"
 export TIMEOUT=10
 
 function waitForPort() {
diff --git a/test/bats/no-ispconfig-ssl.sh b/test/bats/no-ispconfig-ssl.sh
index 45fbf0a..5eae5c0 100755
--- a/test/bats/no-ispconfig-ssl.sh
+++ b/test/bats/no-ispconfig-ssl.sh
@@ -12,13 +12,13 @@ setup() {
 }
 
 @test "ISPConfig at expected HTTP URL" {
-  curl -sL "http://ispconfig:8080" | grep "<title>ISPConfig</title>"
+  curl -sL "http://$CONTAINER:8080" | grep "<title>ISPConfig</title>"
 }
 
 @test "phpMyAdmin at expected HTTP URL" {
-  curl -sL "http://ispconfig:8080/phpmyadmin" | grep "<title>phpMyAdmin</title>"
+  curl -sL "http://$CONTAINER:8080/phpmyadmin" | grep "<title>phpMyAdmin</title>"
 }
 
 @test "ISPConfig at expected HTTP URL" {
-  curl -sL "http://ispconfig:8080/webmail" | grep "<title>Roundcube Webmail :: Welcome to Roundcube Webmail</title>"
+  curl -sL "http://$CONTAINER:8080/webmail" | grep "<title>Roundcube Webmail :: Welcome to Roundcube Webmail</title>"
 }
diff --git a/test/bats/reconfigure.sh b/test/bats/reconfigure.sh
index 7146a5f..c2782ca 100755
--- a/test/bats/reconfigure.sh
+++ b/test/bats/reconfigure.sh
@@ -9,18 +9,18 @@ setup() {
 }
 
 @test "services have been reconfigured to MYSQL_HOST" {
-  docker exec ispconfig grep "^\$conf\['db_host'\] = '0.0.0.0';$" /usr/local/ispconfig/interface/lib/config.inc.php
-  docker exec ispconfig grep "^\$dbserver='0.0.0.0';$" /etc/phpmyadmin/config-db.php
-  docker exec ispconfig grep "^\$config\['db_dsnw'\] = 'mysql://roundcube:secretpassword@0.0.0.0/roundcube';$" /opt/roundcube/config/config.inc.php
+  docker exec "$CONTAINER" grep "^\$conf\['db_host'\] = '0.0.0.0';$" /usr/local/ispconfig/interface/lib/config.inc.php
+  docker exec "$CONTAINER" grep "^\$dbserver='0.0.0.0';$" /etc/phpmyadmin/config-db.php
+  docker exec "$CONTAINER" grep "^\$config\['db_dsnw'\] = 'mysql://roundcube:secretpassword@0.0.0.0/roundcube';$" /opt/roundcube/config/config.inc.php
 }
 
 @test "ispconfig database connection" {
   # The logo is stored in the database
-  curl -Lk "https://ispconfig:8080" | grep -E '<img src="data:image/png;base64,.*>'
+  curl -Lk "https://$CONTAINER:8080" | grep -E '<img src="data:image/png;base64,.*>'
 }
 
 @test "roundcube database connection" {
-  curl -Lk "https://ispconfig:8080/webmail/" | grep -v 'DATABASE ERROR: CONNECTION FAILED!'
+  curl -Lk "https://$CONTAINER:8080/webmail/" | grep -v 'DATABASE ERROR: CONNECTION FAILED!'
 }
 
 # How to test phpMyAdmin?
diff --git a/test/bats/tests.sh b/test/bats/tests.sh
index 0df2e04..1f7c0ae 100755
--- a/test/bats/tests.sh
+++ b/test/bats/tests.sh
@@ -70,7 +70,7 @@ setup() {
 }
 
 @test "stored roundcube password is correctly changed" {
-  run docker exec ispconfig grep "\$config\['db_dsnw'\] = 'mysql://roundcube:reconfigured@localhost/roundcube';" /opt/roundcube/config/config.inc.php
+  run docker exec "$CONTAINER" grep "\$config\['db_dsnw'\] = 'mysql://roundcube:reconfigured@localhost/roundcube';" /opt/roundcube/config/config.inc.php
 }
 
 @test "cron jobs are running" {
diff --git a/test/default/ispconfig.test.js b/test/default/ispconfig.test.js
index 955c84e..d2fa3cb 100644
--- a/test/default/ispconfig.test.js
+++ b/test/default/ispconfig.test.js
@@ -1,5 +1,5 @@
 const puppeteer = require('puppeteer');
-const host = "ispconfig:" + process.env.PORT;
+const host = "ispconfig-test:" + process.env.PORT;
 
 const timeout = 30 * 1000;
 jasmine.DEFAULT_TIMEOUT_INTERVAL = timeout;
diff --git a/test/docker-compose.bats.custom-ssl.test.yml b/test/docker-compose.bats.custom-ssl.test.yml
index ac6a785..2d991d2 100644
--- a/test/docker-compose.bats.custom-ssl.test.yml
+++ b/test/docker-compose.bats.custom-ssl.test.yml
@@ -6,7 +6,7 @@ services:
     image: graze/bats
     command: /app/bats/custom-ssl.sh
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     environment:
@@ -20,7 +20,8 @@ services:
       - ./ssl:/etc/ssl/local:ro
       - /var/run/docker.sock:/var/run/docker.sock
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     extends:
       file: ../docker-compose.template.yml
       service: ispconfig
diff --git a/test/docker-compose.bats.no-ispconfig-ssl.test.yml b/test/docker-compose.bats.no-ispconfig-ssl.test.yml
index 730cd76..80ed1cc 100644
--- a/test/docker-compose.bats.no-ispconfig-ssl.test.yml
+++ b/test/docker-compose.bats.no-ispconfig-ssl.test.yml
@@ -6,7 +6,7 @@ services:
     image: graze/bats
     command: /app/bats/no-ispconfig-ssl.sh
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     environment:
@@ -18,7 +18,8 @@ services:
       - ./ssl:/etc/ssl/local:ro
       - /var/run/docker.sock:/var/run/docker.sock
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     build:
       args:
         BUILD_ISPCONFIG_USE_SSL: "no"
diff --git a/test/docker-compose.bats.reconfigure.test.yml b/test/docker-compose.bats.reconfigure.test.yml
index 61c629c..7e2a904 100644
--- a/test/docker-compose.bats.reconfigure.test.yml
+++ b/test/docker-compose.bats.reconfigure.test.yml
@@ -6,7 +6,7 @@ services:
     image: graze/bats
     command: /app/bats/reconfigure.sh
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     environment:
@@ -15,7 +15,8 @@ services:
       - ./:/app:ro
       - /var/run/docker.sock:/var/run/docker.sock
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     environment:
       - MYSQL_HOST=0.0.0.0
       - DISABLED_SERVICES=mailman
diff --git a/test/docker-compose.bats.test.yml b/test/docker-compose.bats.test.yml
index a985228..1e8cc48 100644
--- a/test/docker-compose.bats.test.yml
+++ b/test/docker-compose.bats.test.yml
@@ -6,7 +6,7 @@ services:
     image: graze/bats
     command: /app/bats/tests.sh
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     volumes:
@@ -15,7 +15,8 @@ services:
     environment:
       - MYSQL_PW=pass
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     extends:
       file: ../docker-compose.template.yml
       service: ispconfig
diff --git a/test/docker-compose.puppeteer.no-phpmyadmin.test.yml b/test/docker-compose.puppeteer.no-phpmyadmin.test.yml
index 7bfe90a..ce51cc6 100644
--- a/test/docker-compose.puppeteer.no-phpmyadmin.test.yml
+++ b/test/docker-compose.puppeteer.no-phpmyadmin.test.yml
@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: Dockerfile.puppeteer
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     cap_add:
@@ -15,7 +15,8 @@ services:
     volumes:
       - './no-phpmyadmin:/app/test:ro'
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     build:
       args:
         BUILD_PHPMYADMIN: "no"
diff --git a/test/docker-compose.puppeteer.remote-db-seeded.test.yml b/test/docker-compose.puppeteer.remote-db-seeded.test.yml
index 3af399e..2938f84 100644
--- a/test/docker-compose.puppeteer.remote-db-seeded.test.yml
+++ b/test/docker-compose.puppeteer.remote-db-seeded.test.yml
@@ -9,13 +9,14 @@ services:
     networks:
       - test_shared
     depends_on:
-      - ispconfig
+      - ispconfig-test
     cap_add:
       - SYS_ADMIN
     volumes:
       - './remote-db:/app/test:ro'
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     build:
       context: ..
       dockerfile: Dockerfile
@@ -25,7 +26,6 @@ services:
         BUILD_PHPMYADMIN: "no"
       extra_hosts:
         database: 172.99.0.1
-    container_name: ispconfig
     hostname: ispconfig
     domainname: test.com
     networks:
diff --git a/test/docker-compose.puppeteer.remote-db.test.yml b/test/docker-compose.puppeteer.remote-db.test.yml
index faf211a..4263bf3 100644
--- a/test/docker-compose.puppeteer.remote-db.test.yml
+++ b/test/docker-compose.puppeteer.remote-db.test.yml
@@ -9,13 +9,14 @@ services:
     networks:
       - test_shared
     depends_on:
-      - ispconfig
+      - ispconfig-test
     cap_add:
       - SYS_ADMIN
     volumes:
       - './remote-db:/app/test:ro'
 
-  ispconfig:
+  ispconfig-test:
+    container_name: ispconfig-test
     build:
       context: ..
       dockerfile: Dockerfile
@@ -25,7 +26,6 @@ services:
         BUILD_PHPMYADMIN: "no"
       extra_hosts:
         database: 172.99.0.1
-    container_name: ispconfig
     hostname: ispconfig
     domainname: test.com
     networks:
diff --git a/test/docker-compose.puppeteer.test.yml b/test/docker-compose.puppeteer.test.yml
index ec075f4..0d31b2b 100644
--- a/test/docker-compose.puppeteer.test.yml
+++ b/test/docker-compose.puppeteer.test.yml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile.puppeteer
     depends_on:
-      - ispconfig
+      - ispconfig-test
     networks:
       - test_shared
     cap_add:
@@ -16,7 +16,7 @@ services:
     volumes:
       - './default:/app/test:ro'
 
-  ispconfig:
+  ispconfig-test:
     build:
       args:
         BUILD_ISPCONFIG_PORT: "443"
diff --git a/test/no-phpmyadmin/phpmyadmin.test.js b/test/no-phpmyadmin/phpmyadmin.test.js
index 00d0e45..b6c48ea 100644
--- a/test/no-phpmyadmin/phpmyadmin.test.js
+++ b/test/no-phpmyadmin/phpmyadmin.test.js
@@ -1,5 +1,5 @@
 const puppeteer = require('puppeteer');
-const host = "ispconfig:8080";
+const host = "ispconfig-test:8080";
 
 const timeout = 30 * 1000;
 jasmine.DEFAULT_TIMEOUT_INTERVAL = timeout;
@@ -8,7 +8,7 @@ page.setDefaultNavigationTimeout(timeout);
 describe('phpMyAdmin Web Interface', () => {
   it('should not be available', async () => {
     try {
-      await page.goto('https://ispconfig:8080/phpmyadmin');
+      await page.goto('https://' + host + '/phpmyadmin');
       throw new Error("phpMyAdmin interface loaded, but it should not be available");
     } catch (error) {
       // should fail
diff --git a/test/remote-db/ispconfig.test.js b/test/remote-db/ispconfig.test.js
index 9f249b3..4ba47bf 100644
--- a/test/remote-db/ispconfig.test.js
+++ b/test/remote-db/ispconfig.test.js
@@ -1,5 +1,5 @@
 const puppeteer = require('puppeteer');
-const host = "ispconfig:8080";
+const host = "ispconfig-test:8080";
 
 const timeout = 30 * 1000;
 jasmine.DEFAULT_TIMEOUT_INTERVAL = timeout;