From 5534dad99c6d9e842c6b8ce2ea5788f3286f6c80 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 10:06:16 -0400 Subject: [PATCH 01/22] libreoffice --- src/libreoffice/.devcontainer.json | 8 ++++++ src/libreoffice/README.md | 17 ++++++++++++ src/libreoffice/devcontainer-template.json | 31 ++++++++++++++++++++++ src/libreoffice/docker-compose.yaml | 20 ++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 src/libreoffice/.devcontainer.json create mode 100644 src/libreoffice/README.md create mode 100644 src/libreoffice/devcontainer-template.json create mode 100644 src/libreoffice/docker-compose.yaml diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json new file mode 100644 index 00000000..9da0ed46 --- /dev/null +++ b/src/libreoffice/.devcontainer.json @@ -0,0 +1,8 @@ +{ + "name": "Libreoffice app", + "dockerComposeFile": "docker-compose.yaml", + "service": "app", + "shutdownAction": "none", + "workspaceFolder": "/workspace/libreoffice", + "remoteUser": "root" +} diff --git a/src/libreoffice/README.md b/src/libreoffice/README.md new file mode 100644 index 00000000..61cb30ad --- /dev/null +++ b/src/libreoffice/README.md @@ -0,0 +1,17 @@ + +# Rstudio (rstudio) + +A Template to run rstudio on workbench + +## Options + +| Options Id | Description | Type | Default Value | +|-----|-----|-----|-----| +| cloud | VM cloud environment | string | gcp | +| login | Whether to log in to workbench CLI | string | false | + + + +--- + +_Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/verily-src/workbench-app-devcontainers/blob/main/src/rstudio/devcontainer-template.json). Add additional notes to a `NOTES.md`._ diff --git a/src/libreoffice/devcontainer-template.json b/src/libreoffice/devcontainer-template.json new file mode 100644 index 00000000..23270865 --- /dev/null +++ b/src/libreoffice/devcontainer-template.json @@ -0,0 +1,31 @@ +{ + "id": "libreoffice", + "version": "0.1.0", + "name": "Libreoffice", + "description": "A Template to libreoffice on workbench", + "documentationURL": "https://github.com/yonghaoy/workbench-app-devcontainers/tree/master/src/libreoffice", + "licenseURL": "https://github.com/yonghaoy/workbench-app-devcontainers/blob/master/LICENSE", + "options": { + "cloud": { + "type": "string", + "description": "VM cloud environment", + "proposals": [ + "gcp", + "aws" + ], + "default": "gcp" + }, + "login": { + "type": "string", + "description": "Whether to log in to workbench CLI", + "proposals": [ + "true", + "false" + ], + "default": "false" + } + }, + "platforms": [ + "Any" + ] +} diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml new file mode 100644 index 00000000..76ce87cb --- /dev/null +++ b/src/libreoffice/docker-compose.yaml @@ -0,0 +1,20 @@ +version: '1.0' +services: + app: + container_name: "application-server" + image: "libreoffice/online:latest" + restart: always + ports: + - 3000:3000 + - 3001:3001 + networks: + - app-network + cap_add: + - SYS_ADMIN + devices: + - /dev/fuse + security_opt: + - apparmor:unconfined +networks: + app-network: + external: true From e17423b2d616c9e3274d8c0bf5485c5612f9fd2f Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 10:43:04 -0400 Subject: [PATCH 02/22] change version --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 76ce87cb..4f4acd4d 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "libreoffice/online:latest" + image: "linuxserver/libreoffice:7.6.3.1-r0-ls77" restart: always ports: - 3000:3000 From bf3ba3aa4412968f85f9e816be4bc82ef7501f48 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 10:55:52 -0400 Subject: [PATCH 03/22] downgrade image --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 4f4acd4d..68db2710 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:7.6.3.1-r0-ls77" + image: "linuxserver/libreoffice:7.2.7.2-r2-ls1" restart: always ports: - 3000:3000 From 802b933578f3bd4184f8974399af4f319cb2d0d8 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 11:15:39 -0400 Subject: [PATCH 04/22] upgrade --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 68db2710..181845e5 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:7.2.7.2-r2-ls1" + image: "linuxserver/libreoffice:7.2.7.2-r2-ls17" restart: always ports: - 3000:3000 From 758d60e6422d72479ceec88be26d7aa05b0160c3 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 11:24:20 -0400 Subject: [PATCH 05/22] downgrade --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 181845e5..0fcbf03d 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:7.2.7.2-r2-ls17" + image: "linuxserver/libreoffice:6.4.6.2-r11-ls35" restart: always ports: - 3000:3000 From 1bc424bd2d5a726a241f6c376056594df8152554 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 11:35:00 -0400 Subject: [PATCH 06/22] change version --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 0fcbf03d..796f7781 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:6.4.6.2-r11-ls35" + image: "linuxserver/libreoffice:6.4.6" restart: always ports: - 3000:3000 From 20d1e56d21b38b491a606afcff0aec66f24669a7 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 11:39:31 -0400 Subject: [PATCH 07/22] upgrade chart --- src/libreoffice/docker-compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 796f7781..102c1c21 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -6,7 +6,6 @@ services: restart: always ports: - 3000:3000 - - 3001:3001 networks: - app-network cap_add: @@ -18,3 +17,5 @@ services: networks: app-network: external: true +volumes: + data: \ No newline at end of file From 7b3dc71b637a92b9ce63cd0fe1be0c605aed705e Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 12:19:25 -0400 Subject: [PATCH 08/22] new image --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 102c1c21..d01138f6 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:6.4.6" + image: "linuxserver/libreoffice:6.4.6.2-r11-ls27" restart: always ports: - 3000:3000 From b32a41a2d10f8ffb5a59875fb8c2d03234083b97 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 12:42:47 -0400 Subject: [PATCH 09/22] update --- src/libreoffice/docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index d01138f6..c63447b5 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,10 +2,10 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:6.4.6.2-r11-ls27" + image: "linuxserver/libreoffice:7.2.2.2-r2-ls58" restart: always ports: - - 3000:3000 + - '3000:3000' networks: - app-network cap_add: From dd311675679d00e2b0b26cb56bfa0ae7553d9578 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 12:44:45 -0400 Subject: [PATCH 10/22] upadte --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index c63447b5..e2305349 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -3,7 +3,7 @@ services: app: container_name: "application-server" image: "linuxserver/libreoffice:7.2.2.2-r2-ls58" - restart: always + restart: unless-stopped ports: - '3000:3000' networks: From 056b9a694ffccd5d752b008d26ac584fd5ae050b Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 12:58:14 -0400 Subject: [PATCH 11/22] not docker compose --- src/libreoffice/.devcontainer.json | 8 +++++--- src/libreoffice/docker-compose.yaml | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 9da0ed46..7e654480 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -1,8 +1,10 @@ { "name": "Libreoffice app", - "dockerComposeFile": "docker-compose.yaml", - "service": "app", + "image": "linuxserver/libreoffice:7.2.2.2-r2-ls58", "shutdownAction": "none", "workspaceFolder": "/workspace/libreoffice", - "remoteUser": "root" + "remoteUser": "root", + "containerEnv": { + "CUSTOM_PORT": "3000" + } } diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index e2305349..76eeafad 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -13,9 +13,8 @@ services: devices: - /dev/fuse security_opt: + - seccomp:unconfined #optional - apparmor:unconfined networks: app-network: - external: true -volumes: - data: \ No newline at end of file + external: true \ No newline at end of file From b8ecfd9fe56ba63e716304e51a58872e08464bf1 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 13:19:51 -0400 Subject: [PATCH 12/22] update --- src/libreoffice/.devcontainer.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 7e654480..9da0ed46 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -1,10 +1,8 @@ { "name": "Libreoffice app", - "image": "linuxserver/libreoffice:7.2.2.2-r2-ls58", + "dockerComposeFile": "docker-compose.yaml", + "service": "app", "shutdownAction": "none", "workspaceFolder": "/workspace/libreoffice", - "remoteUser": "root", - "containerEnv": { - "CUSTOM_PORT": "3000" - } + "remoteUser": "root" } From 2ba1adca03d032638684490bdee55ba15b382571 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 10 May 2024 13:54:58 -0400 Subject: [PATCH 13/22] update --- src/libreoffice/docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 76eeafad..d58c11cc 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -13,7 +13,6 @@ services: devices: - /dev/fuse security_opt: - - seccomp:unconfined #optional - apparmor:unconfined networks: app-network: From 7ae7cd0d7d3f41df1178c1d9c6f241c60c063910 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 22 May 2024 14:41:43 -0400 Subject: [PATCH 14/22] Update docker-compose.yaml --- src/libreoffice/docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index d58c11cc..99b68a38 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:7.2.2.2-r2-ls58" + image: "linuxserver/libreoffice:latest" restart: unless-stopped ports: - '3000:3000' @@ -16,4 +16,4 @@ services: - apparmor:unconfined networks: app-network: - external: true \ No newline at end of file + external: true From 31891c98d2b288ec2c7308a6c0c7da117a75d651 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 22 May 2024 14:43:20 -0400 Subject: [PATCH 15/22] bump image --- src/libreoffice/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/docker-compose.yaml b/src/libreoffice/docker-compose.yaml index 99b68a38..e3a192b6 100644 --- a/src/libreoffice/docker-compose.yaml +++ b/src/libreoffice/docker-compose.yaml @@ -2,7 +2,7 @@ version: '1.0' services: app: container_name: "application-server" - image: "linuxserver/libreoffice:latest" + image: "lscr.io/linuxserver/libreoffice:latest" restart: unless-stopped ports: - '3000:3000' From 35a88449c4576445ac264e7915a3a533b8c56462 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 10 Jun 2024 18:04:10 -0400 Subject: [PATCH 16/22] dump logs --- src/libreoffice/.devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 9da0ed46..2428a9c1 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -4,5 +4,6 @@ "service": "app", "shutdownAction": "none", "workspaceFolder": "/workspace/libreoffice", + "postStartCommand": "/bin/bash -c 'sudo journalctl -f -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", "remoteUser": "root" } From cab172a5f2f407196a49f8f9267eef8f34305ce5 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 10 Jun 2024 18:14:44 -0400 Subject: [PATCH 17/22] dump logs --- src/libreoffice/.devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 2428a9c1..5b869217 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -3,7 +3,7 @@ "dockerComposeFile": "docker-compose.yaml", "service": "app", "shutdownAction": "none", - "workspaceFolder": "/workspace/libreoffice", + "workspaceFolder": "/workspace", "postStartCommand": "/bin/bash -c 'sudo journalctl -f -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", "remoteUser": "root" } From be7f19de7e2d08fd15409dd7a199daba0380fb63 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 10 Jun 2024 18:20:52 -0400 Subject: [PATCH 18/22] dump logs --- src/libreoffice/.devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 5b869217..049d0ed1 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -4,6 +4,7 @@ "service": "app", "shutdownAction": "none", "workspaceFolder": "/workspace", + "postCreateCommand": ["./startupscript/post-startup.sh", "abc", "/config", "${templateOption:cloud}", "${templateOption:login}"], "postStartCommand": "/bin/bash -c 'sudo journalctl -f -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", "remoteUser": "root" } From c2802cb28604021d588b968cd3b04a0b8246a8eb Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 10 Jun 2024 18:49:52 -0400 Subject: [PATCH 19/22] no f --- src/libreoffice/.devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libreoffice/.devcontainer.json b/src/libreoffice/.devcontainer.json index 049d0ed1..078c86a5 100644 --- a/src/libreoffice/.devcontainer.json +++ b/src/libreoffice/.devcontainer.json @@ -5,6 +5,6 @@ "shutdownAction": "none", "workspaceFolder": "/workspace", "postCreateCommand": ["./startupscript/post-startup.sh", "abc", "/config", "${templateOption:cloud}", "${templateOption:login}"], - "postStartCommand": "/bin/bash -c 'sudo journalctl -f -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", + "postStartCommand": "/bin/bash -c 'sudo journalctl -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", "remoteUser": "root" } From c6c398a9ac5760b1407457789b63d48898e6b29e Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Tue, 11 Jun 2024 12:01:02 -0400 Subject: [PATCH 20/22] nf share --- src/nfshare/.devcontainer.json | 10 +++++++++ src/nfshare/README.md | 17 ++++++++++++++ src/nfshare/devcontainer-template.json | 31 ++++++++++++++++++++++++++ src/nfshare/docker-compose.yaml | 19 ++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 src/nfshare/.devcontainer.json create mode 100644 src/nfshare/README.md create mode 100644 src/nfshare/devcontainer-template.json create mode 100644 src/nfshare/docker-compose.yaml diff --git a/src/nfshare/.devcontainer.json b/src/nfshare/.devcontainer.json new file mode 100644 index 00000000..5362d89b --- /dev/null +++ b/src/nfshare/.devcontainer.json @@ -0,0 +1,10 @@ +{ + "name": "nf-shard", + "dockerComposeFile": "docker-compose.yaml", + "service": "app", + "shutdownAction": "none", + "workspaceFolder": "/workspace", + "postCreateCommand": ["./startupscript/post-startup.sh", "abc", "/config", "${templateOption:cloud}", "${templateOption:login}"], + "postStartCommand": "/bin/bash -c 'sudo journalctl -u devcontainer.service > /tmp/system_logs.log & sleep 10; gsutil cp /tmp/system_logs.log gs://mountbucket-terra-vdevel-clean-pear-6753/debugging'", + "remoteUser": "root" +} diff --git a/src/nfshare/README.md b/src/nfshare/README.md new file mode 100644 index 00000000..61cb30ad --- /dev/null +++ b/src/nfshare/README.md @@ -0,0 +1,17 @@ + +# Rstudio (rstudio) + +A Template to run rstudio on workbench + +## Options + +| Options Id | Description | Type | Default Value | +|-----|-----|-----|-----| +| cloud | VM cloud environment | string | gcp | +| login | Whether to log in to workbench CLI | string | false | + + + +--- + +_Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/verily-src/workbench-app-devcontainers/blob/main/src/rstudio/devcontainer-template.json). Add additional notes to a `NOTES.md`._ diff --git a/src/nfshare/devcontainer-template.json b/src/nfshare/devcontainer-template.json new file mode 100644 index 00000000..c19ba8c4 --- /dev/null +++ b/src/nfshare/devcontainer-template.json @@ -0,0 +1,31 @@ +{ + "id": "nfshared", + "version": "0.1.0", + "name": "nf shared", + "description": "A Template to nf shared on workbench", + "documentationURL": "https://github.com/yonghaoy/workbench-app-devcontainers/tree/master/src/libreoffice", + "licenseURL": "https://github.com/yonghaoy/workbench-app-devcontainers/blob/master/LICENSE", + "options": { + "cloud": { + "type": "string", + "description": "VM cloud environment", + "proposals": [ + "gcp", + "aws" + ], + "default": "gcp" + }, + "login": { + "type": "string", + "description": "Whether to log in to workbench CLI", + "proposals": [ + "true", + "false" + ], + "default": "false" + } + }, + "platforms": [ + "Any" + ] +} diff --git a/src/nfshare/docker-compose.yaml b/src/nfshare/docker-compose.yaml new file mode 100644 index 00000000..5f2aa236 --- /dev/null +++ b/src/nfshare/docker-compose.yaml @@ -0,0 +1,19 @@ +version: '1.0' +services: + app: + container_name: "application-server" + image: "augustinast/nf-shard:1.0.0" + restart: unless-stopped + ports: + - '3000:3000' + networks: + - app-network + cap_add: + - SYS_ADMIN + devices: + - /dev/fuse + security_opt: + - apparmor:unconfined +networks: + app-network: + external: true From 2170dcab14deb0cead5bf65a6838595ca6e3dee0 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 18 Oct 2024 16:34:53 -0400 Subject: [PATCH 21/22] fuse --- src/jupyter-aou/.devcontainer.json | 16 +++++++ src/jupyter-aou/README.md | 17 ++++++++ src/jupyter-aou/devcontainer-template.json | 31 ++++++++++++++ src/jupyter-aou/docker-compose.yaml | 50 ++++++++++++++++++++++ startupscript/post-startup.sh | 2 +- 5 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/jupyter-aou/.devcontainer.json create mode 100644 src/jupyter-aou/README.md create mode 100644 src/jupyter-aou/devcontainer-template.json create mode 100644 src/jupyter-aou/docker-compose.yaml diff --git a/src/jupyter-aou/.devcontainer.json b/src/jupyter-aou/.devcontainer.json new file mode 100644 index 00000000..8c965ea6 --- /dev/null +++ b/src/jupyter-aou/.devcontainer.json @@ -0,0 +1,16 @@ +{ + "name": "Jupyter app for AoU", + "dockerComposeFile": "docker-compose.yaml", + "service": "app", + "shutdownAction": "none", + "workspaceFolder": "/workspace", + "postCreateCommand": ["./startupscript/post-startup.sh", "jovyan", "/home/jovyan", "${templateOption:cloud}", "${templateOption:login}"], + // re-mount bucket files on container start up + "postStartCommand":["./startupscript/remount-on-restart.sh", "jovyan", "/home/jovyan", "${templateOption:cloud}", "${templateOption:login}"], + "features": { + "ghcr.io/devcontainers/features/aws-cli:1": {}, + "ghcr.io/dhoeric/features/google-cloud-cli:1": {}, + "ghcr.io/devcontainers/features/java:1": {} + }, + "remoteUser": "root" +} diff --git a/src/jupyter-aou/README.md b/src/jupyter-aou/README.md new file mode 100644 index 00000000..405365ca --- /dev/null +++ b/src/jupyter-aou/README.md @@ -0,0 +1,17 @@ + +# Jupyter (jupyter) + +A Template to run jupyter on workbench + +## Options + +| Options Id | Description | Type | Default Value | +|-----|-----|-----|-----| +| cloud | VM cloud environment | string | gcp | +| login | Whether to log in to workbench CLI | string | false | + + + +--- + +_Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/verily-src/workbench-app-devcontainers/blob/main/src/jupyter/devcontainer-template.json). Add additional notes to a `NOTES.md`._ diff --git a/src/jupyter-aou/devcontainer-template.json b/src/jupyter-aou/devcontainer-template.json new file mode 100644 index 00000000..b6d5c939 --- /dev/null +++ b/src/jupyter-aou/devcontainer-template.json @@ -0,0 +1,31 @@ +{ + "id": "jupyter", + "version": "0.0.2", + "name": "Jupyter", + "description": "A Template to run jupyter on workbench", + "documentationURL": "https://github.com/verily-src/workbench-app-devcontainers/tree/master/src/jupyter", + "licenseURL": "https://github.com/verily-src/workbench-app-devcontainers/blob/master/LICENSE", + "options": { + "cloud": { + "type": "string", + "description": "VM cloud environment", + "proposals": [ + "gcp", + "aws" + ], + "default": "gcp" + }, + "login": { + "type": "string", + "description": "Whether to log in to workbench CLI", + "proposals": [ + "true", + "false" + ], + "default": "false" + } + }, + "platforms": [ + "Any" + ] +} diff --git a/src/jupyter-aou/docker-compose.yaml b/src/jupyter-aou/docker-compose.yaml new file mode 100644 index 00000000..2eb46c61 --- /dev/null +++ b/src/jupyter-aou/docker-compose.yaml @@ -0,0 +1,50 @@ +version: '2.4' +services: + app: + container_name: "application-server" + image: "jupyter/scipy-notebook" + restart: always + volumes: + - .:/workspace:cached + - work:/home/jovyan/work + - gcsfuse-mount:/mnt/gcs + ports: + - '8888:8888' + environment: + JUPYTER_ENABLE_LAB: "yes" + command: "start-notebook.py --ServerApp.token='' --ServerApp.password='' --ServerApp.root_dir=/home/jovyan/work --ServerApp.allow_origin='*'" + networks: + - app-network + devices: + - /dev/fuse + security_opt: + - apparmor:unconfined + wondershaper: + container_name: "wondershaper" + image: "us.gcr.io/broad-dsp-gcr-public/wondershaper:0.0.1" + restart: always + network_mode: "host" + cap_add: + - NET_ADMIN + gcsfuse: + container_name: "gcsfuse" + image: "google/cloud-sdk:latest" + restart: always + volumes: + - gcsfuse-mount:/mnt/gcs + entrypoint: > + /bin/sh -c " + gcsfuse YOUR_BUCKET_NAME /mnt/gcs + " + cap_add: + - SYS_ADMIN + devices: + - /dev/fuse + security_opt: + - apparmor:unconfined +networks: + app-network: + external: true +volumes: + work: + gcsfuse-mount: diff --git a/startupscript/post-startup.sh b/startupscript/post-startup.sh index d5681280..97b19e93 100755 --- a/startupscript/post-startup.sh +++ b/startupscript/post-startup.sh @@ -123,7 +123,7 @@ fi ############################# # Mount buckets ############################# -source "${CLOUD_SCRIPT_DIR}/resource-mount.sh" +# source "${CLOUD_SCRIPT_DIR}/resource-mount.sh" ############################### # cloud platform specific setup From 70958cc88e3ae373944f4592be218c6cff66ced5 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 21 Oct 2024 15:51:07 -0400 Subject: [PATCH 22/22] notebook ai --- src/jupyter-aou/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jupyter-aou/docker-compose.yaml b/src/jupyter-aou/docker-compose.yaml index 2eb46c61..2c6a0d0c 100644 --- a/src/jupyter-aou/docker-compose.yaml +++ b/src/jupyter-aou/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.4' services: app: container_name: "application-server" - image: "jupyter/scipy-notebook" + image: "gcr.io/deeplearning-platform-release/tf-gpu.2-11.py310" restart: always volumes: - .:/workspace:cached