diff --git a/.env.sample b/.env.sample index 3d6e9e9..4ac97c2 100644 --- a/.env.sample +++ b/.env.sample @@ -7,9 +7,6 @@ LETS_ENCRYPT_ENV=production ADMIN_USERNAME=admin -# CUSTOM_THEME_ENABLED=1 -# CUSTOM_THEME_URL= - SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1 SECRET_ADMIN_PASSWORD_VERSION=v1 diff --git a/abra.sh b/abra.sh deleted file mode 100644 index 5c54e9d..0000000 --- a/abra.sh +++ /dev/null @@ -1 +0,0 @@ -export ENTRYPOINT_CONF_VERSION=v1 diff --git a/compose.yml b/compose.yml index 17b8b7b..387f95c 100644 --- a/compose.yml +++ b/compose.yml @@ -11,8 +11,6 @@ services: - admin_password - db_password environment: - - CUSTOM_THEME_ENABLED - - CUSTOM_THEME_URL - DB_ADDR=db - DB_DATABASE=keycloak - DB_PASSWORD_FILE=/run/secrets/db_password @@ -21,11 +19,6 @@ services: - KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password - KEYCLOAK_USER=${ADMIN_USERNAME} - PROXY_ADDRESS_FORWARDING=true - configs: - - source: entrypoint_conf - target: /docker-entrypoint.sh - mode: 0555 - entrypoint: /docker-entrypoint.sh healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] interval: 30s @@ -82,9 +75,3 @@ secrets: volumes: mariadb: - -configs: - entrypoint_conf: - name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION} - file: entrypoint.sh.tmpl - template_driver: golang diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl deleted file mode 100644 index d93843a..0000000 --- a/entrypoint.sh.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -{{ if eq (env "CUSTOM_THEME_ENABLED") "1" }} -microdnf update && microdnf install git -git clone "$CUSTOM_THEME_URL" "/opt/jboss/keycloak/themes/$CUSTOM_THEME_NAME" -{{ end }} - -# upstream entrypoint -# https://github.com/keycloak/keycloak-containers/blob/aa2e5515ccb05116e49ab38839d8fcfdd17c45aa/server/Dockerfile#L30 -/usr/local/bin/entrypoint.sh "$@"