chore: publish 0.2.1+4.1.0 release

.env.sample

@@ -7,23 +7,29 @@ SECRET_ADMIN_PASSWORD_VERSION=v1
 
 DEFAULT_LOCALES="fr_FR fr_FR.UTF-8 en_GB en_GB.UTF-8 en_US en_US.UTF-8 nl_NL nl_NL.UTF-8"
 
+COMPOSE_FILE="compose.yml"
+
 # Custom R version
-#COMPOSE_FILE="compose.yml:compose.version.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.version.yml"
 #R_VERSION=3.6.3
 
 # MSSQL driver
 MSSQL_ENABLED="1"
 
 # OpenID Connect (SSO)
-# COMPOSE_FILE="compose.yml:compose.oidc.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.oidc.yml"
-# OIDC_ENABLED=1
+#OIDC_ENABLED=1
-# OIDC_CLIENT_ID=
+#OIDC_CLIENT_ID=
-# OIDC_ISSUER_URL=
+#OIDC_ISSUER_URL=
-# SECRET_OIDC_CLIENT_SECRET=v1
+#SECRET_OIDC_CLIENT_SECRET=v1
 
 # Keycloak integration
-# COMPOSE_FILE="compose.yml:compose.keycloak.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
-# KEYCLOAK_ENABLED=1
+#KEYCLOAK_ENABLED=1
-# KEYCLOAK_CLIENT_ID=
+#KEYCLOAK_CLIENT_ID=
-# KEYCLOAK_CLIENT_TOKEN_URL=
+#KEYCLOAK_CLIENT_TOKEN_URL=
-# SECRET_KEYCLOAK_CLIENT_SECRET=v1
+#SECRET_KEYCLOAK_CLIENT_SECRET=v1
+
+# Shared secret
+#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak-sharedsecret.yml"
+#SHARED_SECRET_NAME=keycloak_rstudio_client_secret

abra.sh

@@ -1,4 +1,4 @@
-export CUSTOM_ENTRYPOINT_VERSION=v12
+export CUSTOM_ENTRYPOINT_VERSION=v13
 export OIDC_CONF_VERSION=v1
 export PAM_EXEC_OAUTH2_YAML_VERSION=v1
 export PAM_SCRIPT_AUTH_VERSION=v4

compose.keycloak-sharedsecret.yml

@@ -0,0 +1,7 @@
+---
+version: "3.8"
+
+secrets:
+  keycloak_client_secret:
+    name: ${SHARED_SECRET_NAME}
+    external: true

compose.yml

@@ -29,7 +29,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+4.1.0"
+        - "coop-cloud.${STACK_NAME}.version=0.2.1+4.1.0"
     entrypoint: /docker-entrypoint.sh
     command: /init
 

entrypoint.sh.tmpl

@@ -30,6 +30,7 @@ echo 'auth-openid-base-uri=https://{{ env "DOMAIN" }}' >> /etc/rstudio/rserver.c
 {{ end }}
 
 {{ if eq (env "KEYCLOAK_ENABLED") "1" }}
+apt update
 apt install -y libpam-script
 mkdir -p /opt/pam-exec-oauth2/
 wget https://github.com/WASHNote/pam-exec-oauth2/releases/download/v0.0.1/pam-exec-oauth2 -O /opt/pam-exec-oauth2/pam-exec-oauth2