Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix float #207

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 13 additions & 0 deletions server-pro/conf/rserver-float.conf
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion server-pro/conf/rserver.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions server-pro/docker-compose.test-float.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: '2.3'
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
- 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"
# overwrite the config file for floating
- "./conf/rserver-float.conf:/etc/rstudio/rserver.conf"
networks:
- default

networks:
default:
name: rstudio-docker-products
2 changes: 2 additions & 0 deletions server-pro/docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ services:
image: $IMAGE_NAME
command: /run_tests.sh
entrypoint: []
ports:
- "8787"
environment:
# uses .env by default
- RSP_VERSION
Expand Down