chore: publish 0.3.0+4.3.2 release

.env.sample

@@ -28,7 +28,7 @@ MSSQL_ENABLED="1"
 #KEYCLOAK_ENABLED=1
 #KEYCLOAK_CLIENT_ID=
 #KEYCLOAK_CLIENT_TOKEN_URL=
-#SECRET_KEYCLOAK_CLIENT_SECRET=v1
+#SECRET_KEYCLOAK_CLIENT_SECRET_VERSION=v1
 
 # Shared secret
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak-sharedsecret.yml"

abra.sh

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

compose.keycloak.yml

@@ -32,5 +32,5 @@ configs:
 
 secrets:
   keycloak_client_secret:
-    name: ${STACK_NAME}_keycloak_client_secret_${SECRET_KEYCLOAK_CLIENT_SECRET}
+    name: ${STACK_NAME}_keycloak_client_secret_${SECRET_KEYCLOAK_CLIENT_SECRET_VERSION}
     external: true

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: rocker/tidyverse:4.1.0
+    image: rocker/tidyverse:4.3.2
     networks:
       - proxy
     volumes:
@@ -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.2.1+4.1.0"
+        - "coop-cloud.${STACK_NAME}.version=0.3.0+4.3.2"
     entrypoint: /docker-entrypoint.sh
     command: /init
 

entrypoint.sh.tmpl

@@ -30,7 +30,7 @@ echo 'auth-openid-base-uri=https://{{ env "DOMAIN" }}' >> /etc/rstudio/rserver.c
 {{ end }}
 
 {{ if eq (env "KEYCLOAK_ENABLED") "1" }}
-apt update
+apt update --allow-releaseinfo-change
 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
@@ -48,7 +48,7 @@ curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 
 curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
 
-apt update && apt install -yq msodbcsql17 mssql-tools
+apt update && apt -o Dpkg::Options::="--force-overwrite" install -yq msodbcsql17 mssql-tools
 {{ end }}
 
 locale-gen {{ env "DEFAULT_LOCALES" }}

pam_script_auth.sh

@@ -10,9 +10,10 @@ if ! id "$PAM_USER" &>/dev/null; then
 	# without it, UID→username mapping changes on every container restart, which
 	# creates file ownership issues and prevents RStudio from working.
 	# See https://github.com/WASHNote/washnote-apps/issues/67
-	uid=$(echo "$PAM_USER" | md5sum | grep -Eo "[[:digit:]]{3}"  | head -n1)
+	uid=$(echo "$PAM_USER" | md5sum | grep -Eo "[[:digit:]]{3}"  | head -n1 | sed -E 's/^0+//')
 	uid=$((1000+uid))
 	adduser --uid="$uid" "$PAM_USER" --disabled-password --quiet --gecos ""
+    usermod -aG staff "$PAM_USER"
 fi
 
 exit 0