From 1e11ab058b59e2aa8d60e4ed957736979c3799e0 Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Sun, 25 Jul 2021 13:08:44 +0300 Subject: [PATCH] Add keycloak variables --- api/.env.example | 2 +- docker-compose-hetzner.yml | 7 +++++++ docker-compose-jfrog.yml | 6 ++++++ hetzner_deploy.groovy | 7 +++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/api/.env.example b/api/.env.example index 0e4b37a..5c2585a 100644 --- a/api/.env.example +++ b/api/.env.example @@ -42,7 +42,7 @@ MLTD_PORT=5000 OD_HOST=od OD_PORT=9091 -KEYCLOAK_REALM_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlP2vlb7nX+mOejTfuYOmD49FgOzQGZjIagb68Bci44hUvjfY9Mmbz9OhWVuhz5UyLScHrdOByI234yVjqAtOtSYQ0Wb/U0Ukt7ele9TCkQ4GVv92vpvW9Q2YcPVmJGHXtvmoNIQEnht9Sbfhcg8dmjO5c5766gnFgY6vh6cb2/1ECw7w9jloQ8zWT/6YRXJ7MTbE3d9t0c2Oyrnf5XmKsq9eyLea57tbX94/Aj0+i7br/bS40z/lAjNx2umrcgk/y1BmUMvNqQtf9rgz7I3aRro8n8HWwE7VkQN2W2YxhYvWwvJf75kN3oASTzZibJjpsFw/DBrm0Cf79XqoU77npQIDAQAB +KEYCLOAK_REALM_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg9OruW+gRnBcm4S1da+TDj7LdDXTFykExlg2z5Fx/vv4ldJf1/vCAEdSP/HZXRMq5TRefnkzVyv66COmjyPjGNB2P240HOOzBPnU5ibsu7H2betZvR+uj/y9o5T3hUpPy+Gbb02i57xoKyECy+yRtPjmF63R0rFfFBV/LdScWdnltTY7YfmRe6dRcBZG5QZ8bKTWP40QUzwG2PnJpIEi3KdYp4qDx4LvXnSvIC0Z6E59R2oialMKQtPO5Xu9Ea6fYe4guqX9zdpoC+bcvxjJ275zj+RoFVaQHhGBZDPeK4VITmXiUWkBbTGQwEVY8ZY4b62kWFwjOg9yOv47s6N7cQIDAQAB KEYCLOAK_LOAD_USER_FROM_DATABASE=false KEYCLOAK_USER_PROVIDER_CREDENTIAL=name KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE=preferred_username diff --git a/docker-compose-hetzner.yml b/docker-compose-hetzner.yml index 342a686..6a98f4b 100644 --- a/docker-compose-hetzner.yml +++ b/docker-compose-hetzner.yml @@ -123,6 +123,13 @@ services: - "MLTD_PORT=${MLTD_PORT}" - "OD_HOST=${OD_HOST}" - "OD_PORT=${OD_PORT}" + - "KEYCLOAK_REALM_PUBLIC_KEY=${KEYCLOAK_REALM_PUBLIC_KEY}" + - "KEYCLOAK_LOAD_USER_FROM_DATABASE=${KEYCLOAK_LOAD_USER_FROM_DATABASE}" + - "KEYCLOAK_USER_PROVIDER_CREDENTIAL=${KEYCLOAK_USER_PROVIDER_CREDENTIAL}" + - "KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE=${KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE}" + - "KEYCLOAK_APPEND_DECODED_TOKEN=${KEYCLOAK_APPEND_DECODED_TOKEN}" + - "KEYCLOAK_ALLOWED_RESOURCES=${KEYCLOAK_ALLOWED_RESOURCES}" + - "AUTH_ENABLED=${AUTH_ENABLED}" networks: - "proxy-network" diff --git a/docker-compose-jfrog.yml b/docker-compose-jfrog.yml index a3b919b..ab2e505 100644 --- a/docker-compose-jfrog.yml +++ b/docker-compose-jfrog.yml @@ -109,6 +109,12 @@ services: - "MLTD_PORT=${MLTD_PORT}" - "OD_HOST=${OD_HOST}" - "OD_PORT=${OD_PORT}" + - "KEYCLOAK_REALM_PUBLIC_KEY=${KEYCLOAK_REALM_PUBLIC_KEY}" + - "KEYCLOAK_LOAD_USER_FROM_DATABASE=${KEYCLOAK_LOAD_USER_FROM_DATABASE}" + - "KEYCLOAK_USER_PROVIDER_CREDENTIAL=${KEYCLOAK_USER_PROVIDER_CREDENTIAL}" + - "KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE=${KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE}" + - "KEYCLOAK_APPEND_DECODED_TOKEN=${KEYCLOAK_APPEND_DECODED_TOKEN}" + - "KEYCLOAK_ALLOWED_RESOURCES=${KEYCLOAK_ALLOWED_RESOURCES}" - "AUTH_ENABLED=${AUTH_ENABLED}" #OD diff --git a/hetzner_deploy.groovy b/hetzner_deploy.groovy index 8903b12..aefe8f8 100644 --- a/hetzner_deploy.groovy +++ b/hetzner_deploy.groovy @@ -59,6 +59,13 @@ pipeline { OD_HOST = "od" OD_PORT = "9091" + KEYCLOAK_REALM_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg9OruW+gRnBcm4S1da+TDj7LdDXTFykExlg2z5Fx/vv4ldJf1/vCAEdSP/HZXRMq5TRefnkzVyv66COmjyPjGNB2P240HOOzBPnU5ibsu7H2betZvR+uj/y9o5T3hUpPy+Gbb02i57xoKyECy+yRtPjmF63R0rFfFBV/LdScWdnltTY7YfmRe6dRcBZG5QZ8bKTWP40QUzwG2PnJpIEi3KdYp4qDx4LvXnSvIC0Z6E59R2oialMKQtPO5Xu9Ea6fYe4guqX9zdpoC+bcvxjJ275zj+RoFVaQHhGBZDPeK4VITmXiUWkBbTGQwEVY8ZY4b62kWFwjOg9yOv47s6N7cQIDAQAB" + KEYCLOAK_LOAD_USER_FROM_DATABASE = "false" + KEYCLOAK_USER_PROVIDER_CREDENTIAL = "name" + KEYCLOAK_TOKEN_PRINCIPAL_ATTRIBUTE = "preferred_username" + KEYCLOAK_APPEND_DECODED_TOKEN = "false" + KEYCLOAK_ALLOWED_RESOURCES = "account" + AUTH_ENABLED = "false" } -- 2.2.2