Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
knoflook | c9ce66e7fa |
20
.drone.yml
20
.drone.yml
|
@ -3,12 +3,10 @@ kind: pipeline
|
||||||
name: deploy to swarm-test.autonomic.zone
|
name: deploy to swarm-test.autonomic.zone
|
||||||
steps:
|
steps:
|
||||||
- name: deployment
|
- name: deployment
|
||||||
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
|
image: decentral1se/stack-ssh-deploy:latest
|
||||||
settings:
|
settings:
|
||||||
host: swarm-test.autonomic.zone
|
host: swarm-test.autonomic.zone
|
||||||
stack: keycloak
|
stack: keycloak
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
generate_secrets: true
|
generate_secrets: true
|
||||||
purge: true
|
purge: true
|
||||||
deploy_key:
|
deploy_key:
|
||||||
|
@ -25,17 +23,11 @@ trigger:
|
||||||
- master
|
- master
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: generate recipe catalogue
|
name: recipe release
|
||||||
steps:
|
steps:
|
||||||
- name: release a new version
|
- name: release a new version
|
||||||
image: plugins/downstream
|
image: thecoopcloud/drone-abra:latest
|
||||||
settings:
|
settings:
|
||||||
server: https://build.coopcloud.tech
|
command: recipe keycloak release
|
||||||
token:
|
deploy_key:
|
||||||
from_secret: drone_abra-bot_token
|
from_secret: abra_bot_deploy_key
|
||||||
fork: true
|
|
||||||
repositories:
|
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
event: tag
|
|
||||||
|
|
|
@ -6,13 +6,7 @@ DOMAIN=keycloak.example.com
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
ADMIN_USERNAME=admin
|
ADMIN_USERNAME=admin
|
||||||
WELCOME_THEME=keycloak
|
|
||||||
|
|
||||||
COMPOSE_FILE="compose.yml"
|
|
||||||
|
|
||||||
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
SECRET_ADMIN_PASSWORD_VERSION=v1
|
SECRET_ADMIN_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
# Enable persistent theme volume, if you want to apply a custom theme
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.theme.yml"
|
|
||||||
|
|
|
@ -21,9 +21,9 @@
|
||||||
2. Deploy [`coop-cloud/traefik`][cc-traefik]
|
2. Deploy [`coop-cloud/traefik`][cc-traefik]
|
||||||
3. `abra app new keycloak --secrets` (optionally with `--pass` if you'd like
|
3. `abra app new keycloak --secrets` (optionally with `--pass` if you'd like
|
||||||
to save secrets in `pass`)
|
to save secrets in `pass`)
|
||||||
4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
|
4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
|
||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
5. `abra app deploy YOURAPPDOMAIN`
|
5. `abra app YOURAPPDOMAIN deploy`
|
||||||
|
|
||||||
## How do I setup a custom theme?
|
## How do I setup a custom theme?
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
image: "jboss/keycloak:16.1.1"
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
|
- internal
|
||||||
|
secrets:
|
||||||
|
- admin_password
|
||||||
|
- db_password
|
||||||
|
environment:
|
||||||
|
- DB_ADDR=db
|
||||||
|
- JBDC_PARAMS="useSSL=false"
|
||||||
|
- DB_DATABASE=keycloak
|
||||||
|
- DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
- DB_USER=keycloak
|
||||||
|
- DB_VENDOR=mariadb
|
||||||
|
- KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
|
- KEYCLOAK_USER=${ADMIN_USERNAME}
|
||||||
|
- PROXY_ADDRESS_FORWARDING=true
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 1m
|
||||||
|
volumes:
|
||||||
|
- "themes:/opt/jboss/keycloak/themes"
|
||||||
|
depends_on:
|
||||||
|
- mariadb
|
||||||
|
deploy:
|
||||||
|
update_config:
|
||||||
|
failure_action: rollback
|
||||||
|
order: start-first
|
||||||
|
labels:
|
||||||
|
- "traefik.enable=true"
|
||||||
|
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8080"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
|
- "coop-cloud.${STACK_NAME}.version=4.0.1+16.1.1"
|
||||||
|
|
||||||
|
db:
|
||||||
|
image: "mariadb:10.8"
|
||||||
|
environment:
|
||||||
|
- MYSQL_DATABASE=keycloak
|
||||||
|
- MYSQL_USER=keycloak
|
||||||
|
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||||
|
secrets:
|
||||||
|
- db_password
|
||||||
|
- db_root_password
|
||||||
|
volumes:
|
||||||
|
- "mariadb:/var/lib/mysql"
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
|
||||||
|
networks:
|
||||||
|
internal:
|
||||||
|
proxy:
|
||||||
|
external: true
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
admin_password:
|
||||||
|
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
||||||
|
external: true
|
||||||
|
db_password:
|
||||||
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
|
external: true
|
||||||
|
db_root_password:
|
||||||
|
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||||
|
external: true
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
mariadb:
|
||||||
|
themes:
|
|
@ -1,10 +0,0 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
volumes:
|
|
||||||
- "themes:/opt/keycloak/themes"
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
themes:
|
|
70
compose.yml
70
compose.yml
|
@ -3,9 +3,7 @@ version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "keycloak/keycloak:23.0.6"
|
image: "jboss/keycloak:16.1.1"
|
||||||
entrypoint: >
|
|
||||||
bash -c "KEYCLOAK_ADMIN_PASSWORD=\"$$(cat /run/secrets/admin_password)\" KC_DB_PASSWORD=\"$$(cat /run/secrets/db_password)\" /opt/keycloak/bin/kc.sh start"
|
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
|
@ -13,24 +11,23 @@ services:
|
||||||
- admin_password
|
- admin_password
|
||||||
- db_password
|
- db_password
|
||||||
environment:
|
environment:
|
||||||
- KC_DB=mariadb
|
- DB_ADDR=db
|
||||||
- KC_DB_URL_DATABASE=keycloak
|
- JBDC_PARAMS="useSSL=false"
|
||||||
- KC_DB_URL_HOST=db
|
- DB_DATABASE=keycloak
|
||||||
- KC_HOSTNAME=${DOMAIN}
|
- DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- KC_PROXY=edge
|
- DB_USER=keycloak
|
||||||
- KC_SPI_CONNECTIONS_JPA_LEGACY_MIGRATION_STRATEGY=update
|
- DB_VENDOR=postgres
|
||||||
- KEYCLOAK_ADMIN=${ADMIN_USERNAME}
|
- KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
- KEYCLOAK_WELCOME_THEME=${WELCOME_THEME}
|
- KEYCLOAK_USER=${ADMIN_USERNAME}
|
||||||
# NOTE(3wc): disabled due to missing curl binary, see
|
- PROXY_ADDRESS_FORWARDING=true
|
||||||
# https://git.coopcloud.tech/coop-cloud/keycloak/issues/15
|
healthcheck:
|
||||||
# healthcheck:
|
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
||||||
# test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
interval: 30s
|
||||||
# interval: 30s
|
timeout: 10s
|
||||||
# timeout: 10s
|
retries: 10
|
||||||
# retries: 10
|
start_period: 1m
|
||||||
# start_period: 1m
|
|
||||||
volumes:
|
volumes:
|
||||||
- "providers:/opt/keycloak/providers"
|
- "themes:/opt/jboss/keycloak/themes"
|
||||||
depends_on:
|
depends_on:
|
||||||
- mariadb
|
- mariadb
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -46,31 +43,25 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=8.0.1+23.0.6"
|
- "coop-cloud.${STACK_NAME}.version=4.0.1+16.1.1"
|
||||||
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "mariadb:11.2"
|
image: postgres:11
|
||||||
environment:
|
networks:
|
||||||
- MYSQL_DATABASE=keycloak
|
- backend
|
||||||
- MYSQL_USER=keycloak
|
secrets:
|
||||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
- db_password
|
||||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
environment:
|
||||||
|
POSTGRES_DB: keycloak
|
||||||
|
POSTGRES_USER: keycloak
|
||||||
|
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
- db_root_password
|
|
||||||
volumes:
|
volumes:
|
||||||
- "mariadb:/var/lib/mysql"
|
- "postgres_data:/var/lib/postgresql/data"
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
backupbot.backup: "true"
|
|
||||||
backupbot.backup.path: "/tmp/dump.sql.gz"
|
|
||||||
backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
|
|
||||||
backupbot.backup.pre-hook: "sh -c 'mysqldump -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak | gzip > /tmp/dump.sql.gz'"
|
|
||||||
backupbot.restore.pre-hook: "sh -c 'cd /tmp && gzip -d dump.sql.gz'"
|
|
||||||
backupbot.restore: "true"
|
|
||||||
backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak < /tmp/dump.sql && rm -f /tmp/dump.sql'"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
internal:
|
internal:
|
||||||
|
@ -90,4 +81,5 @@ secrets:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb:
|
mariadb:
|
||||||
providers:
|
themes:
|
||||||
|
postgres_data:
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
You'll need to remove `/auth/` from your app SSO URLs, e.g.
|
|
||||||
|
|
||||||
https://foo.example.com/auth/realms/foo/protocol/openid-connect/auth
|
|
||||||
|
|
||||||
Would become:
|
|
||||||
|
|
||||||
https://foo.example.com/realms/foo/protocol/openid-connect/auth
|
|
||||||
|
|
||||||
-- decentral1se @ Autonomic
|
|
|
@ -1,2 +0,0 @@
|
||||||
Healthchecks are disabled, see
|
|
||||||
https://git.coopcloud.tech/coop-cloud/keycloak/issues/15
|
|
|
@ -1,5 +0,0 @@
|
||||||
A persistent volume for themes is now optional, and not enabled by default.
|
|
||||||
|
|
||||||
If you are using a custom theme, consult the recipe `.env.sample` to see the new
|
|
||||||
variables you need to add. You can use `abra app check ...` to verify that
|
|
||||||
they've been added correctly.
|
|
Loading…
Reference in New Issue