diff --git a/deploy/import-init.sh b/deploy/import-init.sh index 829531b2..fff4b853 100755 --- a/deploy/import-init.sh +++ b/deploy/import-init.sh @@ -9,7 +9,7 @@ fi function import_init() { NS=keycloak - CHART_VERSION=1.3.0-beta.1-develop + CHART_VERSION=1.3.0-develop helm repo add mosip https://mosip.github.io/mosip-helm helm repo update diff --git a/deploy/install.sh b/deploy/install.sh index 1268c6ee..c4551a00 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -19,7 +19,13 @@ function installing_keycloak() { helm repo update echo Installing - helm -n $NS install $SERVICE_NAME mosip/keycloak --version "7.1.18" --set image.repository=mosipqa/mosip-artemis-keycloak --set image.tag=develop --set image.pullPolicy=Always -f values.yaml --wait + helm -n $NS install $SERVICE_NAME mosip/keycloak --version "7.1.18" \ + --set image.repository=mosipqa/mosip-artemis-keycloak \ + --set image.tag=1.3.x \ + --set image.pullPolicy=Always \ + --set postgresql.primary.image.repository="mosipid/postgresql" \ + --set postgresql.primary.image.tag="14.2.0-debian-10-r70" \ + -f values.yaml --wait EXTERNAL_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-iam-external-host}) echo Install Istio gateway, virtual service diff --git a/deploy/keycloak_init.sh b/deploy/keycloak_init.sh index 162341e4..d27bd82d 100755 --- a/deploy/keycloak_init.sh +++ b/deploy/keycloak_init.sh @@ -38,7 +38,7 @@ read_user_input(){ function initialize_keycloak() { NS=keycloak - CHART_VERSION=1.3.0-beta.1-develop + CHART_VERSION=1.3.0-develop helm repo add mosip https://mosip.github.io/mosip-helm helm repo update diff --git a/deploy/upgrade-init.sh b/deploy/upgrade-init.sh index 68acf3e3..310d4538 100755 --- a/deploy/upgrade-init.sh +++ b/deploy/upgrade-init.sh @@ -9,7 +9,7 @@ fi function upgrade_init() { NS=keycloak - CHART_VERSION=1.3.0-beta.1-develop + CHART_VERSION=1.3.0-develop helm repo add mosip https://mosip.github.io/mosip-helm helm repo update diff --git a/helm/keycloak-init/Chart.yaml b/helm/keycloak-init/Chart.yaml index b2926b5e..d054de68 100644 --- a/helm/keycloak-init/Chart.yaml +++ b/helm/keycloak-init/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: keycloak-init description: A Helm chart for Kubernetes to initialize Keycloak (updating for test) type: application -version: 1.3.0-beta.1-develop +version: 1.3.0-develop appVersion: 1.2.0 dependencies: - name: common diff --git a/keycloak-artemis/Dockerfile b/keycloak-artemis/Dockerfile index d547c20a..be143bcf 100644 --- a/keycloak-artemis/Dockerfile +++ b/keycloak-artemis/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/bitnami/keycloak:16.1.1 +FROM docker.io/mosipid/keycloak:16.1.1 USER root @@ -23,6 +23,11 @@ COPY ./standalone/deployments/* /opt/bitnami/keycloak/standalone/deployments COPY rootfs / +# Patch Debian repo (stretch/buster are archived now) + +RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list && \ + sed -i '/security.debian.org/d' /etc/apt/sources.list + RUN chmod +x /usr/sbin/install_packages && chmod g+rwX /opt/bitnami && \ chmod +x /opt/bitnami/scripts/keycloak/entrypoint.sh /opt/bitnami/scripts/keycloak/setup.sh /opt/bitnami/scripts/keycloak/run.sh && \ chown -R 1001:1001 /opt/*