From 546ce72e70a4071e06254d6dec70df379aa5dc71 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 14 Mar 2023 10:49:11 -0400
Subject: [PATCH] Switch to entrypoint instead of custom image for MSSQL

---
 .env.sample        |  2 +-
 abra.sh            |  2 +-
 compose.mssql.yml  |  6 ------
 entrypoint.sh.tmpl | 12 ++++++++++++
 4 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 compose.mssql.yml

diff --git a/.env.sample b/.env.sample
index fb1b913..8b9af41 100644
--- a/.env.sample
+++ b/.env.sample
@@ -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
 
 # MSSQL driver
-COMPOSE_FILE="compose.yml:compose.mssql.yml"
+MSSQL_ENABLED="1"
 
 # OpenID Connect (SSO)
 # COMPOSE_FILE="compose.yml:compose.oidc.yml"
diff --git a/abra.sh b/abra.sh
index 101d3f7..8c4b28f 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export CUSTOM_ENTRYPOINT_VERSION=v7
+export CUSTOM_ENTRYPOINT_VERSION=v12
 export OIDC_CONF_VERSION=v1
 export PAM_EXEC_OAUTH2_YAML_VERSION=v1
 export PAM_SCRIPT_AUTH_VERSION=v4
diff --git a/compose.mssql.yml b/compose.mssql.yml
deleted file mode 100644
index fa7d4a8..0000000
--- a/compose.mssql.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    image: washweb/tidyverse-msodbcsql17:4.1.0
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 4367985..2ecd351 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -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
 {{ 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" }}
 
 exec "$@"