From 27ad6cc8139e3c5a398313ecee5aa43dd62c3283 Mon Sep 17 00:00:00 2001
From: Cole Arendt <cole.arendt@outlook.com>
Date: Mon, 20 Sep 2021 15:33:31 -0400
Subject: [PATCH 1/4] update config files

---
 server-pro/conf/rserver-float.conf | 13 +++++++++++++
 server-pro/conf/rserver.conf       |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/server-pro/conf/rserver-float.conf b/server-pro/conf/rserver-float.conf
index f04dd8c8..535fd63e 100644
--- a/server-pro/conf/rserver-float.conf
+++ b/server-pro/conf/rserver-float.conf
@@ -1 +1,14 @@
 server-license-type=remote
+
+server-health-check-enabled=1
+admin-enabled=1
+
+www-port=8787
+server-project-sharing=1
+
+# Launcher Config
+launcher-address=127.0.0.1
+launcher-port=5559
+launcher-sessions-enabled=1
+launcher-default-cluster=Local
+launcher-sessions-callback-address=http://127.0.0.1:8787
diff --git a/server-pro/conf/rserver.conf b/server-pro/conf/rserver.conf
index 756044d7..3906d72a 100644
--- a/server-pro/conf/rserver.conf
+++ b/server-pro/conf/rserver.conf
@@ -2,7 +2,7 @@ server-health-check-enabled=1
 admin-enabled=1
 
 www-port=8787
-server-project-sharing=0
+server-project-sharing=1
 
 # Launcher Config
 launcher-address=127.0.0.1

From f0912d5e44d4efd76de1e4933f526bb24ad818e2 Mon Sep 17 00:00:00 2001
From: Cole Arendt <cole.arendt@outlook.com>
Date: Mon, 20 Sep 2021 15:35:01 -0400
Subject: [PATCH 2/4] add make targets and test targets for float

---
 Makefile                                 |  5 ++++-
 server-pro/docker-compose.test-float.yml | 25 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 server-pro/docker-compose.test-float.yml

diff --git a/Makefile b/Makefile
index ba24eb88..4ff89490 100644
--- a/Makefile
+++ b/Makefile
@@ -76,9 +76,13 @@ rsp-hook:
 test-rsp: test-server-pro
 test-server-pro:
 	cd ./server-pro && IMAGE_NAME=rstudio/rstudio-server-pro:$(RSP_VERSION) docker-compose -f docker-compose.test.yml run sut
+test-server-pro-float:
+	cd ./server-pro && IMAGE_NAME=rstudio/rstudio-server-pro:$(RSP_VERSION) docker-compose -f docker-compose.test-float.yml run sut
 test-rsp-i: test-server-pro-i
 test-server-pro-i:
 	cd ./server-pro && IMAGE_NAME=rstudio/rstudio-server-pro:$(RSP_VERSION) docker-compose -f docker-compose.test.yml run sut bash
+test-server-pro-float-i:
+	cd ./server-pro && IMAGE_NAME=rstudio/rstudio-server-pro:$(RSP_VERSION) docker-compose -f docker-compose.test-float.yml run sut bash
 
 
 run-rsp: run-server-pro
@@ -91,7 +95,6 @@ run-server-pro:  ## Run RSP container
 		-e RSP_LICENSE=$(RSP_LICENSE) \
 		rstudio/rstudio-server-pro:$(RSP_VERSION) $(CMD)
 
-
 rsc: connect
 connect:  ## Build RSC image
 	docker build -t rstudio/rstudio-connect:$(RSC_VERSION) --build-arg R_VERSION=$(R_VERSION) --build-arg RSC_VERSION=$(RSC_VERSION) connect
diff --git a/server-pro/docker-compose.test-float.yml b/server-pro/docker-compose.test-float.yml
new file mode 100644
index 00000000..1e0d4684
--- /dev/null
+++ b/server-pro/docker-compose.test-float.yml
@@ -0,0 +1,25 @@
+version: '2.3'
+services:
+
+  sut:
+    image: $IMAGE_NAME
+    command: /run_tests.sh
+    entrypoint: []
+    environment:
+      # uses .env by default
+      - RSP_VERSION
+      - R_VERSION 
+      - PYTHON_VERSION
+      - PYTHON_VERSION_ALT
+      - JUPYTER_PYTHON_VERSION
+      - R_VERSION_ALT
+      - RSP_LICENSE_SERVER=rsp-float-lic:8989
+    volumes:
+      - "./test/run_tests.sh:/run_tests.sh"
+      - "./test/goss.yaml:/tmp/goss.yaml"
+    networks:
+      - default
+
+networks:
+  default:
+    name: rstudio-docker-products

From 00e8723babd1d5dd38ace686518b1652071b9ac7 Mon Sep 17 00:00:00 2001
From: Cole Arendt <cole.arendt@outlook.com>
Date: Mon, 20 Sep 2021 15:42:25 -0400
Subject: [PATCH 3/4] mount the proper rserver config file

---
 server-pro/docker-compose.test-float.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server-pro/docker-compose.test-float.yml b/server-pro/docker-compose.test-float.yml
index 1e0d4684..b47c7cca 100644
--- a/server-pro/docker-compose.test-float.yml
+++ b/server-pro/docker-compose.test-float.yml
@@ -17,6 +17,8 @@ services:
     volumes:
       - "./test/run_tests.sh:/run_tests.sh"
       - "./test/goss.yaml:/tmp/goss.yaml"
+      # overwrite the config file for floating
+      - "./conf/rserver-float.conf:/etc/rstudio/rserver.conf"
     networks:
       - default
 

From dafc58bcc8e9949c9a8e35b03c5d4bdc22f2de9b Mon Sep 17 00:00:00 2001
From: Cole Arendt <cole.arendt@outlook.com>
Date: Mon, 20 Sep 2021 20:21:27 -0400
Subject: [PATCH 4/4] make test files more useful

---
 server-pro/docker-compose.test-float.yml | 4 ++++
 server-pro/docker-compose.test.yml       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/server-pro/docker-compose.test-float.yml b/server-pro/docker-compose.test-float.yml
index b47c7cca..c07c6493 100644
--- a/server-pro/docker-compose.test-float.yml
+++ b/server-pro/docker-compose.test-float.yml
@@ -4,7 +4,11 @@ services:
   sut:
     image: $IMAGE_NAME
     command: /run_tests.sh
+    # command: /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
     entrypoint: []
+    privileged: true
+    ports:
+      - "8787"
     environment:
       # uses .env by default
       - RSP_VERSION
diff --git a/server-pro/docker-compose.test.yml b/server-pro/docker-compose.test.yml
index 17d1b16b..e82c5b59 100644
--- a/server-pro/docker-compose.test.yml
+++ b/server-pro/docker-compose.test.yml
@@ -5,6 +5,8 @@ services:
     image: $IMAGE_NAME
     command: /run_tests.sh
     entrypoint: []
+    ports:
+      - "8787"
     environment:
       # uses .env by default
       - RSP_VERSION