generated from coop-cloud/example
Compare commits
8 Commits
0.2.5+4.1.
...
main
Author | SHA1 | Date |
---|---|---|
3wc | 7c03834602 | |
3wc | 81de69d8cb | |
3wc | cfe7947f94 | |
knoflook | 5d41f7539a | |
3wc | 4520d4520f | |
3wc | 9884f47704 | |
trav | 73b259327f | |
3wc | bee5f3895a |
|
@ -16,6 +16,12 @@ COMPOSE_FILE="compose.yml"
|
||||||
# MSSQL driver
|
# MSSQL driver
|
||||||
MSSQL_ENABLED="1"
|
MSSQL_ENABLED="1"
|
||||||
|
|
||||||
|
# Comment out if you are using keycloak or oidc
|
||||||
|
COMPOSE_FILE="$COMPOSE_FILE:compose.local-users.yml"
|
||||||
|
# Share the local user database with other instances
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.local-users-shared.yml"
|
||||||
|
#LOCAL_USERS_VOLUME=rstudio_example_com_users
|
||||||
|
|
||||||
# OpenID Connect (SSO)
|
# OpenID Connect (SSO)
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.oidc.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.oidc.yml"
|
||||||
#OIDC_ENABLED=1
|
#OIDC_ENABLED=1
|
||||||
|
@ -28,7 +34,7 @@ MSSQL_ENABLED="1"
|
||||||
#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_VERSION=v1
|
||||||
|
|
||||||
# Shared secret
|
# Shared secret
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak-sharedsecret.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak-sharedsecret.yml"
|
||||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
||||||
export CUSTOM_ENTRYPOINT_VERSION=v14
|
export CUSTOM_ENTRYPOINT_VERSION=v17
|
||||||
export OIDC_CONF_VERSION=v1
|
export OIDC_CONF_VERSION=v1
|
||||||
export PAM_EXEC_OAUTH2_YAML_VERSION=v1
|
export PAM_EXEC_OAUTH2_YAML_VERSION=v1
|
||||||
export PAM_SCRIPT_AUTH_VERSION=v7
|
export PAM_SCRIPT_AUTH_VERSION=v7
|
||||||
|
|
|
@ -32,5 +32,5 @@ configs:
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
keycloak_client_secret:
|
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
|
external: true
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
users:
|
||||||
|
external: true
|
||||||
|
name: ${LOCAL_USERS_VOLUME}
|
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
volumes:
|
||||||
|
- users:/opt/users
|
||||||
|
environment:
|
||||||
|
- COPY_USERS=1
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
users:
|
|
@ -3,7 +3,7 @@ version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: rocker/tidyverse:4.1.0
|
image: rocker/tidyverse:4.3.2
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -29,7 +29,7 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.2.5+4.1.0"
|
- "coop-cloud.${STACK_NAME}.version=0.4.0+4.3.2"
|
||||||
entrypoint: /docker-entrypoint.sh
|
entrypoint: /docker-entrypoint.sh
|
||||||
command: /init
|
command: /init
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,35 @@ file_env() {
|
||||||
unset "$fileVar"
|
unset "$fileVar"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{{ if eq (env "COPY_USERS") "1" }}
|
||||||
|
cp /opt/users/passwd /etc/passwd || true
|
||||||
|
cp /opt/users/shadow /etc/shadow || true
|
||||||
|
cp /opt/users/group /etc/group || true
|
||||||
|
|
||||||
|
copy_users() {
|
||||||
|
while true; do
|
||||||
|
if [ /etc/passwd -nt /opt/users/passwd ]; then
|
||||||
|
cp -uv /etc/passwd /opt/users/passwd
|
||||||
|
else
|
||||||
|
cp -uv /opt/users/passwd /etc/passwd
|
||||||
|
fi
|
||||||
|
if [ /etc/shadow -nt /opt/users/shadow ]; then
|
||||||
|
cp -uv /etc/shadow /opt/users/shadow
|
||||||
|
else
|
||||||
|
cp -uv /opt/users/shadow /etc/shadow
|
||||||
|
fi
|
||||||
|
if [ /etc/group -nt /opt/users/group ]; then
|
||||||
|
cp -uv /etc/group /opt/users/group
|
||||||
|
else
|
||||||
|
cp -uv /opt/users/group /etc/group
|
||||||
|
fi
|
||||||
|
sleep 60
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_users &
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
file_env "PASSWORD"
|
file_env "PASSWORD"
|
||||||
|
|
||||||
{{ if eq (env "OIDC_ENABLED") "1" }}
|
{{ if eq (env "OIDC_ENABLED") "1" }}
|
||||||
|
@ -48,7 +77,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
|
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 }}
|
{{ end }}
|
||||||
|
|
||||||
locale-gen {{ env "DEFAULT_LOCALES" }}
|
locale-gen {{ env "DEFAULT_LOCALES" }}
|
||||||
|
|
Loading…
Reference in New Issue