From e805fb62fb950943bc3a21a3016c3eb0d75d67d5 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Tue, 27 Oct 2020 00:34:30 +0100
Subject: [PATCH] e2e: use docker proxy for test images

---
 e2e/test_flows_enroll.py            | 2 +-
 e2e/test_provider_oauth2_github.py  | 2 +-
 e2e/test_provider_oauth2_grafana.py | 2 +-
 e2e/test_provider_oauth2_oidc.py    | 2 +-
 e2e/test_provider_proxy.py          | 2 +-
 e2e/test_provider_saml.py           | 2 +-
 e2e/test_source_oauth.py            | 4 ++--
 e2e/test_source_saml.py             | 2 +-
 swagger.yaml                        | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/e2e/test_flows_enroll.py b/e2e/test_flows_enroll.py
index 0d5be0e50..8a96e344d 100644
--- a/e2e/test_flows_enroll.py
+++ b/e2e/test_flows_enroll.py
@@ -23,7 +23,7 @@ class TestFlowsEnroll(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "mailhog/mailhog:v1.0.1",
+            "image": "docker.beryju.org/proxy/mailhog/mailhog:v1.0.1",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/e2e/test_provider_oauth2_github.py b/e2e/test_provider_oauth2_github.py
index 3e2a75a58..c33a68de6 100644
--- a/e2e/test_provider_oauth2_github.py
+++ b/e2e/test_provider_oauth2_github.py
@@ -33,7 +33,7 @@ class TestProviderOAuth2Github(SeleniumTestCase):
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         """Setup client grafana container which we test OAuth against"""
         return {
-            "image": "grafana/grafana:7.1.0",
+            "image": "docker.beryju.org/proxy/grafana/grafana:7.1.0",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/e2e/test_provider_oauth2_grafana.py b/e2e/test_provider_oauth2_grafana.py
index 8d9270ea1..353dcb811 100644
--- a/e2e/test_provider_oauth2_grafana.py
+++ b/e2e/test_provider_oauth2_grafana.py
@@ -47,7 +47,7 @@ class TestProviderOAuth2OAuth(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "grafana/grafana:7.1.0",
+            "image": "docker.beryju.org/proxy/grafana/grafana:7.1.0",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/e2e/test_provider_oauth2_oidc.py b/e2e/test_provider_oauth2_oidc.py
index 0a98d8303..540b6c74e 100644
--- a/e2e/test_provider_oauth2_oidc.py
+++ b/e2e/test_provider_oauth2_oidc.py
@@ -53,7 +53,7 @@ class TestProviderOAuth2OIDC(SeleniumTestCase):
         client: DockerClient = from_env()
         client.images.pull("beryju/oidc-test-client")
         container = client.containers.run(
-            image="beryju/oidc-test-client",
+            image="docker.beryju.org/proxy/beryju/oidc-test-client",
             detach=True,
             network_mode="host",
             auto_remove=True,
diff --git a/e2e/test_provider_proxy.py b/e2e/test_provider_proxy.py
index ff1823369..7269923d3 100644
--- a/e2e/test_provider_proxy.py
+++ b/e2e/test_provider_proxy.py
@@ -36,7 +36,7 @@ class TestProviderProxy(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "traefik/whoami:latest",
+            "image": "docker.beryju.org/proxy/traefik/whoami:latest",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/e2e/test_provider_saml.py b/e2e/test_provider_saml.py
index e3620bbd8..67d696339 100644
--- a/e2e/test_provider_saml.py
+++ b/e2e/test_provider_saml.py
@@ -38,7 +38,7 @@ class TestProviderSAML(SeleniumTestCase):
         client: DockerClient = from_env()
         client.images.pull("beryju/oidc-test-client")
         container = client.containers.run(
-            image="beryju/saml-test-sp",
+            image="docker.beryju.org/proxy/beryju/saml-test-sp",
             detach=True,
             network_mode="host",
             auto_remove=True,
diff --git a/e2e/test_source_oauth.py b/e2e/test_source_oauth.py
index d14d2d2ba..fa33ed04d 100644
--- a/e2e/test_source_oauth.py
+++ b/e2e/test_source_oauth.py
@@ -74,7 +74,7 @@ class TestSourceOAuth2(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "quay.io/dexidp/dex:v2.24.0",
+            "image": "docker.beryju.org/proxy/quay.io/dexidp/dex:v2.24.0",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
@@ -258,7 +258,7 @@ class TestSourceOAuth1(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "beryju/oauth1-test-server",
+            "image": "docker.beryju.org/proxy/beryju/oauth1-test-server",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/e2e/test_source_saml.py b/e2e/test_source_saml.py
index 59df63c01..437b29411 100644
--- a/e2e/test_source_saml.py
+++ b/e2e/test_source_saml.py
@@ -75,7 +75,7 @@ class TestSourceSAML(SeleniumTestCase):
 
     def get_container_specs(self) -> Optional[Dict[str, Any]]:
         return {
-            "image": "kristophjunge/test-saml-idp:1.15",
+            "image": "docker.beryju.org/proxy/kristophjunge/test-saml-idp:1.15",
             "detach": True,
             "network_mode": "host",
             "auto_remove": True,
diff --git a/swagger.yaml b/swagger.yaml
index 3aed73a6f..d83c14117 100755
--- a/swagger.yaml
+++ b/swagger.yaml
@@ -7948,7 +7948,7 @@ definitions:
         minLength: 1
       session_duration:
         title: Session duration
-        description: 'Determines how long a session lasts. Default of -1 means that
+        description: 'Determines how long a session lasts. Default of 0 means that
           the sessions lasts until the browser is closed. (Format: hours=-1;minutes=-2;seconds=-3)'
         type: string
         minLength: 1