generated from coop-cloud/example
Switch to entrypoint instead of custom image for MSSQL
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone/push Build was killed
Details
This commit is contained in:
parent
1dc40dd636
commit
546ce72e70
|
@ -12,7 +12,7 @@ DEFAULT_LOCALES="fr_FR fr_FR.UTF-8 en_GB en_GB.UTF-8 en_US en_US.UTF-8 nl_NL nl_
|
||||||
#R_VERSION=3.6.3
|
#R_VERSION=3.6.3
|
||||||
|
|
||||||
# MSSQL driver
|
# MSSQL driver
|
||||||
COMPOSE_FILE="compose.yml:compose.mssql.yml"
|
MSSQL_ENABLED="1"
|
||||||
|
|
||||||
# OpenID Connect (SSO)
|
# OpenID Connect (SSO)
|
||||||
# COMPOSE_FILE="compose.yml:compose.oidc.yml"
|
# COMPOSE_FILE="compose.yml:compose.oidc.yml"
|
||||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
||||||
export CUSTOM_ENTRYPOINT_VERSION=v7
|
export CUSTOM_ENTRYPOINT_VERSION=v12
|
||||||
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=v4
|
export PAM_SCRIPT_AUTH_VERSION=v4
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
image: washweb/tidyverse-msodbcsql17:4.1.0
|
|
|
@ -38,6 +38,18 @@ echo 'auth requisite pam_exec.so log=/tmp/pam_exec.log expose_authtok /opt/pam-e
|
||||||
echo 'auth requisite pam_script.so' >> /etc/pam.d/common-auth
|
echo 'auth requisite pam_script.so' >> /etc/pam.d/common-auth
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if eq (env "MSSQL_ENABLED") "1" }}
|
||||||
|
export ACCEPT_EULA=Y
|
||||||
|
|
||||||
|
apt --allow-releaseinfo-change update && apt install -yq curl gpg libglpk40
|
||||||
|
|
||||||
|
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
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
locale-gen {{ env "DEFAULT_LOCALES" }}
|
locale-gen {{ env "DEFAULT_LOCALES" }}
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|
Loading…
Reference in New Issue