From 4daa13d582aff8f05710374db9727868ad463de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Thu, 11 Apr 2024 15:46:39 +0200
Subject: [PATCH] Split

---
 compose_files/docker-compose.db-mssql.yml | 31 +++++++++++++++++++
 compose_files/docker-compose.mssql.yml    | 36 ++++-------------------
 2 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 compose_files/docker-compose.db-mssql.yml

diff --git a/compose_files/docker-compose.db-mssql.yml b/compose_files/docker-compose.db-mssql.yml
new file mode 100644
index 0000000..b20daff
--- /dev/null
+++ b/compose_files/docker-compose.db-mssql.yml
@@ -0,0 +1,31 @@
+version: '3'
+volumes:
+  mssql-db:
+    driver: local
+
+networks:
+  mssql-network:
+    driver: bridge
+
+services:
+  # https://blog.logrocket.com/docker-sql-server/
+  mssql:
+    container_name: mssql
+    image: mcr.microsoft.com/mssql/server:2022-RTM-ubuntu-20.04
+    platform: linux/amd64
+    environment:
+      SA_PASSWORD: "YourStrong!Passw0rd"
+      ACCEPT_EULA: "Y"
+    healthcheck:
+      # test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "SELECT 1" -b -o /dev/null
+      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'test') BEGIN CREATE DATABASE test; END ELSE BEGIN SELECT 1; END;" -b -o /dev/null
+      start_period: 4s
+      interval: 0.2s
+      timeout: 5s
+      retries: 100
+    volumes:
+      - mssql-db:/var/opt/mssql
+    ports:
+      - "1433:1433"
+    networks:
+      - mssql-network
diff --git a/compose_files/docker-compose.mssql.yml b/compose_files/docker-compose.mssql.yml
index ed4460c..a984a21 100644
--- a/compose_files/docker-compose.mssql.yml
+++ b/compose_files/docker-compose.mssql.yml
@@ -1,16 +1,12 @@
 version: '3'
-volumes:
-  mssql-db:
-    driver: local
 
-networks:
-  mssql-network:
-    driver: bridge
+include:
+- docker-compose.db-mssql.yml
 
 services:
 
 # -- MSSQL SERVICE --
-  rdb_mssql:
+  rdb_mssql_test:
     container_name: rdb_mssql
     image: ghcr.io/krlmlr/rdb/r-mssql
     platform: linux/amd64
@@ -23,27 +19,5 @@ services:
     stdin_open: true
     volumes:
       # simple test
-      - ./test/test-mssql.R:/root/workspace/.Rprofile
-    entrypoint: ["R"]
-
-  # https://blog.logrocket.com/docker-sql-server/
-  mssql:
-    container_name: mssql
-    image: mcr.microsoft.com/mssql/server:2022-RTM-ubuntu-20.04
-    platform: linux/amd64
-    environment:
-      SA_PASSWORD: "YourStrong!Passw0rd"
-      ACCEPT_EULA: "Y"
-    healthcheck:
-      # test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "SELECT 1" -b -o /dev/null
-      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "YourStrong!Passw0rd" -Q "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'test') BEGIN CREATE DATABASE test; END ELSE BEGIN SELECT 1; END;" -b -o /dev/null
-      start_period: 4s
-      interval: 0.2s
-      timeout: 5s
-      retries: 100
-    volumes:
-      - mssql-db:/var/opt/mssql
-    ports:
-      - "1433:1433"
-    networks:
-      - mssql-network
+      - ./test/test-mssql.R:/root/workspace/test.R
+    entrypoint: ["Rscript", "/root/workspace/test.R"]