From ae8cf00a215c80c95802bc522159d782676c35a9 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 8 Jun 2021 15:32:23 +0200 Subject: [PATCH] tests/e2e: switch to ghcr images Signed-off-by: Jens Langhammer --- tests/e2e/test_provider_oauth2_oidc.py | 2 +- tests/e2e/test_provider_oauth2_oidc_implicit.py | 2 +- tests/e2e/test_provider_saml.py | 2 +- tests/e2e/test_source_oauth.py | 2 +- website/docs/installation/configuration.md | 7 ++++++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/e2e/test_provider_oauth2_oidc.py b/tests/e2e/test_provider_oauth2_oidc.py index 90140a0e8..0ddf828ba 100644 --- a/tests/e2e/test_provider_oauth2_oidc.py +++ b/tests/e2e/test_provider_oauth2_oidc.py @@ -52,7 +52,7 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): sleep(1) client: DockerClient = from_env() container = client.containers.run( - image="beryju/oidc-test-client", + image="ghcr.io/beryju/oidc-test-client:latest", detach=True, network_mode="host", auto_remove=True, diff --git a/tests/e2e/test_provider_oauth2_oidc_implicit.py b/tests/e2e/test_provider_oauth2_oidc_implicit.py index 7596a2700..2c555bddc 100644 --- a/tests/e2e/test_provider_oauth2_oidc_implicit.py +++ b/tests/e2e/test_provider_oauth2_oidc_implicit.py @@ -52,7 +52,7 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): sleep(1) client: DockerClient = from_env() container = client.containers.run( - image="beryju/oidc-test-client", + image="ghcr.io/beryju/oidc-test-client:latest", detach=True, network_mode="host", auto_remove=True, diff --git a/tests/e2e/test_provider_saml.py b/tests/e2e/test_provider_saml.py index cc49e693b..f841b268d 100644 --- a/tests/e2e/test_provider_saml.py +++ b/tests/e2e/test_provider_saml.py @@ -42,7 +42,7 @@ class TestProviderSAML(SeleniumTestCase): """Setup client saml-sp container which we test SAML against""" client: DockerClient = from_env() container = client.containers.run( - image="beryju/saml-test-sp", + image="ghcr.io/beryju/saml-test-sp:latest", detach=True, network_mode="host", auto_remove=True, diff --git a/tests/e2e/test_source_oauth.py b/tests/e2e/test_source_oauth.py index 5bc0151be..c8a73dac5 100644 --- a/tests/e2e/test_source_oauth.py +++ b/tests/e2e/test_source_oauth.py @@ -290,7 +290,7 @@ class TestSourceOAuth1(SeleniumTestCase): def get_container_specs(self) -> Optional[dict[str, Any]]: return { - "image": "beryju/oauth1-test-server", + "image": "ghcr.io/beryju/oauth1-test-server:latest", "detach": True, "network_mode": "host", "auto_remove": True, diff --git a/website/docs/installation/configuration.md b/website/docs/installation/configuration.md index a598baa26..f8ec1a80d 100644 --- a/website/docs/installation/configuration.md +++ b/website/docs/installation/configuration.md @@ -93,7 +93,12 @@ Defaults to `info`. - `AUTHENTIK_OUTPOSTS__DOCKER_IMAGE_BASE` - This is the prefix used for authentik-managed outposts. Default: `beryju/authentik`. + Placeholders: + - `%(type)s`: Outpost type; proxy, ldap, etc + - `%(version)s`: Current version; 2021.4.1 + - `%(build_hash)s`: Build hash if you're running a beta version + + Placeholder for outpost docker images. Default: `ghcr.io/goauthentik/%(type)s:%(version)s`. ### AUTHENTIK_AUTHENTIK