*: migrate everything to goauthentik.io docker proxy

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-10-12 11:01:32 +02:00
parent 5753182e03
commit ecfc3a6d93
16 changed files with 19 additions and 18 deletions

View File

@ -14,13 +14,14 @@ jobs:
- name: Pre-release test - name: Pre-release test
run: | run: |
sudo apt-get install -y pwgen sudo apt-get install -y pwgen
echo "AUTHENTIK_IMAGE=testing" >> .env
echo "AUTHENTIK_TAG=latest" >> .env echo "AUTHENTIK_TAG=latest" >> .env
echo "PG_PASS=$(pwgen 40 1)" >> .env echo "PG_PASS=$(pwgen 40 1)" >> .env
echo "AUTHENTIK_SECRET_KEY=$(pwgen 50 1)" >> .env echo "AUTHENTIK_SECRET_KEY=$(pwgen 50 1)" >> .env
docker-compose pull -q docker-compose pull -q
docker build \ docker build \
--no-cache \ --no-cache \
-t ghcr.io/goauthentik/server:latest \ -t testing:latest \
-f Dockerfile . -f Dockerfile .
docker-compose up --no-start docker-compose up --no-start
docker-compose start postgresql redis docker-compose start postgresql redis

View File

@ -54,7 +54,7 @@ outposts:
# %(type)s: Outpost type; proxy, ldap, etc # %(type)s: Outpost type; proxy, ldap, etc
# %(version)s: Current version; 2021.4.1 # %(version)s: Current version; 2021.4.1
# %(build_hash)s: Build hash if you're running a beta version # %(build_hash)s: Build hash if you're running a beta version
docker_image_base: "ghcr.io/goauthentik/%(type)s:%(version)s" docker_image_base: "goauthentik.io/%(type)s:%(version)s"
disable_update_check: false disable_update_check: false
avatars: env://AUTHENTIK_AUTHENTIK__AVATARS?gravatar avatars: env://AUTHENTIK_AUTHENTIK__AVATARS?gravatar

View File

@ -97,7 +97,7 @@ class DockerController(BaseController):
try: try:
self.client.images.pull(image) self.client.images.pull(image)
except DockerException: except DockerException:
image = f"ghcr.io/goauthentik/{self.outpost.type}:latest" image = f"goauthentik.io/{self.outpost.type}:latest"
self.client.images.pull(image) self.client.images.pull(image)
return image return image

View File

@ -18,7 +18,7 @@ class PytestTestRunner: # pragma: no cover
CONFIG.y_set("authentik.geoip", "tests/GeoLite2-City-Test.mmdb") CONFIG.y_set("authentik.geoip", "tests/GeoLite2-City-Test.mmdb")
CONFIG.y_set( CONFIG.y_set(
"outposts.docker_image_base", "outposts.docker_image_base",
f"ghcr.io/goauthentik/dev-%(type)s:{get_docker_tag()}", f"goauthentik.io/dev-%(type)s:{get_docker_tag()}",
) )
def run_tests(self, test_labels): def run_tests(self, test_labels):

View File

@ -17,7 +17,7 @@ services:
image: redis:alpine image: redis:alpine
restart: unless-stopped restart: unless-stopped
server: server:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.8} image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.9.8}
restart: unless-stopped restart: unless-stopped
command: server command: server
environment: environment:
@ -38,7 +38,7 @@ services:
- "0.0.0.0:9000:9000" - "0.0.0.0:9000:9000"
- "0.0.0.0:9443:9443" - "0.0.0.0:9443:9443"
worker: worker:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.8} image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.9.8}
restart: unless-stopped restart: unless-stopped
command: worker command: worker
environment: environment:

View File

@ -33,7 +33,7 @@ class TestProviderLDAP(SeleniumTestCase):
"""Start ldap container based on outpost created""" """Start ldap container based on outpost created"""
client: DockerClient = from_env() client: DockerClient = from_env()
container = client.containers.run( container = client.containers.run(
image=self.get_container_image("ghcr.io/goauthentik/dev-ldap"), image=self.get_container_image("goauthentik.io/dev-ldap"),
detach=True, detach=True,
network_mode="host", network_mode="host",
auto_remove=True, auto_remove=True,

View File

@ -42,7 +42,7 @@ class TestProviderProxy(SeleniumTestCase):
"""Start proxy container based on outpost created""" """Start proxy container based on outpost created"""
client: DockerClient = from_env() client: DockerClient = from_env()
container = client.containers.run( container = client.containers.run(
image=self.get_container_image("ghcr.io/goauthentik/dev-proxy"), image=self.get_container_image("goauthentik.io/dev-proxy"),
detach=True, detach=True,
network_mode="host", network_mode="host",
auto_remove=True, auto_remove=True,

View File

@ -108,5 +108,5 @@ class OutpostDockerTests(TestCase):
self.assertEqual(compose["version"], "3.5") self.assertEqual(compose["version"], "3.5")
self.assertEqual( self.assertEqual(
compose["services"]["authentik_proxy"]["image"], compose["services"]["authentik_proxy"]["image"],
f"ghcr.io/goauthentik/dev-proxy:{get_docker_tag()}", f"goauthentik.io/dev-proxy:{get_docker_tag()}",
) )

View File

@ -108,5 +108,5 @@ class TestProxyDocker(TestCase):
self.assertEqual(compose["version"], "3.5") self.assertEqual(compose["version"], "3.5")
self.assertEqual( self.assertEqual(
compose["services"]["authentik_proxy"]["image"], compose["services"]["authentik_proxy"]["image"],
f"ghcr.io/goauthentik/dev-proxy:{get_docker_tag()}", f"goauthentik.io/dev-proxy:{get_docker_tag()}",
) )

View File

@ -128,7 +128,7 @@ Optionally disable the update check. Defaults to `false`.
- `%(version)s`: Current version; 2021.4.1 - `%(version)s`: Current version; 2021.4.1
- `%(build_hash)s`: Build hash if you're running a beta version - `%(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`. Placeholder for outpost docker images. Default: `goauthentik.io/%(type)s:%(version)s`.
### AUTHENTIK_AVATARS ### AUTHENTIK_AVATARS

View File

@ -13,7 +13,7 @@ version: "3.5"
services: services:
authentik_proxy: authentik_proxy:
image: ghcr.io/goauthentik/proxy:2021.9.8 image: goauthentik.io/proxy:2021.9.8
# Optionally specify which networks the container should be # Optionally specify which networks the container should be
# might be needed to reach the core authentik server # might be needed to reach the core authentik server
# networks: # networks:
@ -40,7 +40,7 @@ version: "3.5"
services: services:
authentik_ldap: authentik_ldap:
image: ghcr.io/goauthentik/ldap:2021.9.8 image: goauthentik.io/ldap:2021.9.8
# Optionally specify which networks the container should be # Optionally specify which networks the container should be
# might be needed to reach the core authentik server # might be needed to reach the core authentik server
# networks: # networks:

View File

@ -88,7 +88,7 @@ spec:
secretKeyRef: secretKeyRef:
key: authentik_host_insecure key: authentik_host_insecure
name: authentik-outpost-api name: authentik-outpost-api
image: ghcr.io/goauthentik/proxy:2021.9.8 image: goauthentik.io/proxy:2021.9.8
name: proxy name: proxy
ports: ports:
- containerPort: 9000 - containerPort: 9000

View File

@ -211,7 +211,7 @@ services:
- '--entrypoints.https.address=:443' - '--entrypoints.https.address=:443'
authentik_proxy: authentik_proxy:
image: ghcr.io/goauthentik/proxy:2021.5.1 image: goauthentik.io/proxy:2021.5.1
ports: ports:
- 9000:9000 - 9000:9000
- 9443:9443 - 9443:9443

View File

@ -151,6 +151,6 @@ Update your values to use the new images:
```yaml ```yaml
image: image:
repository: ghcr.io/goauthentik/server repository: goauthentik.io/server
tag: 2021.8.5 tag: 2021.8.5
``` ```

View File

@ -206,6 +206,6 @@ Update your values to use the new images:
```yaml ```yaml
image: image:
repository: ghcr.io/goauthentik/server repository: goauthentik.io/server
tag: 2021.9.1 tag: 2021.9.1
``` ```

View File

@ -38,7 +38,7 @@ async function getToken(event) {
headers: forwardHeaders, headers: forwardHeaders,
}); });
const tokenResult = await tokenRes.text(); const tokenResult = await tokenRes.text();
console.debug(`oci-proxy[token]: Status ${tokenRes.status} body '${tokenResult}'`) console.debug(`oci-proxy[token]: Status ${tokenRes.status}`);
return { return {
statusCode: tokenRes.status, statusCode: tokenRes.status,
body: tokenResult, body: tokenResult,