From 01371bbe20127c655fe55be6eea9343c8407e7fe Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Mon, 7 Oct 2024 17:00:50 -0700 Subject: [PATCH] chore(openchallenges): remove the RStudio project (#2886) --- .devcontainer/devcontainer.json | 10 +- apps/openchallenges/rstudio/.env.example | 1 - apps/openchallenges/rstudio/.gitignore | 0 apps/openchallenges/rstudio/Dockerfile | 1 - apps/openchallenges/rstudio/project.json | 54 - .../rstudio/workspace/notebooks/example.Rmd | 18 - .../workspace/notebooks/example.nb.html | 16096 ---------------- docker/openchallenges/serve-detach.sh | 1 - docker/openchallenges/services/rstudio.yml | 17 - 9 files changed, 1 insertion(+), 16197 deletions(-) delete mode 100644 apps/openchallenges/rstudio/.env.example delete mode 100644 apps/openchallenges/rstudio/.gitignore delete mode 100644 apps/openchallenges/rstudio/Dockerfile delete mode 100644 apps/openchallenges/rstudio/project.json delete mode 100644 apps/openchallenges/rstudio/workspace/notebooks/example.Rmd delete mode 100644 apps/openchallenges/rstudio/workspace/notebooks/example.nb.html delete mode 100644 docker/openchallenges/services/rstudio.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8a8aaf0b11..4d6e44225b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -68,7 +68,7 @@ }, "forwardPorts": [ 2432, 3000, 3306, 3333, 4200, 4211, 5200, 5432, 5601, 7010, 7443, 7200, 7888, 8010, 8071, 8000, - 8080, 8081, 8082, 8084, 8085, 8086, 8090, 8200, 8787, 8888, 8889, 9090, 9104, 9200, 9411, 27017 + 8080, 8081, 8082, 8084, 8085, 8086, 8090, 8200, 8888, 8889, 9090, 9104, 9200, 9411, 27017 ], "portsAttributes": { "2432": { @@ -107,10 +107,6 @@ "label": "openchallenges-opensearch-dashboards", "onAutoForward": "silent" }, - "6787": { - "label": "synapse-rstudio", - "onAutoForward": "silent" - }, "7010": { "label": "schematic-api-docs", "onAutoForward": "silent" @@ -163,10 +159,6 @@ "label": "openchallenges-config-server", "onAutoForward": "silent" }, - "8787": { - "label": "openchallenges-rstudio", - "onAutoForward": "silent" - }, "8888": { "label": "openchallenges-notebook", "onAutoForward": "silent" diff --git a/apps/openchallenges/rstudio/.env.example b/apps/openchallenges/rstudio/.env.example deleted file mode 100644 index a3d7216952..0000000000 --- a/apps/openchallenges/rstudio/.env.example +++ /dev/null @@ -1 +0,0 @@ -PASSWORD=changeme \ No newline at end of file diff --git a/apps/openchallenges/rstudio/.gitignore b/apps/openchallenges/rstudio/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/apps/openchallenges/rstudio/Dockerfile b/apps/openchallenges/rstudio/Dockerfile deleted file mode 100644 index 7b0d6b6686..0000000000 --- a/apps/openchallenges/rstudio/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM rocker/rstudio:4.3.1 \ No newline at end of file diff --git a/apps/openchallenges/rstudio/project.json b/apps/openchallenges/rstudio/project.json deleted file mode 100644 index 99a0438ffa..0000000000 --- a/apps/openchallenges/rstudio/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "openchallenges-rstudio", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "apps/openchallenges/rstudio/src", - "projectType": "application", - "targets": { - "create-config": { - "executor": "nx:run-commands", - "options": { - "command": "cp -n .env.example .env", - "cwd": "{projectRoot}" - } - }, - "serve-detach": { - "executor": "nx:run-commands", - "options": { - "command": "docker/openchallenges/serve-detach.sh openchallenges-rstudio" - }, - "dependsOn": [] - }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/rstudio", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-rstudio"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, - "publish-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/rstudio", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-rstudio"], - "tags": ["type=edge,branch=main", "type=sha"] - }, - "push": true - }, - "dependsOn": ["build-image"] - }, - "scan-image": { - "executor": "nx:run-commands", - "options": { - "command": "trivy image ghcr.io/sage-bionetworks/openchallenges-rstudio:local --quiet", - "color": true - } - } - }, - "tags": ["type:app", "scope:client"], - "implicitDependencies": [] -} diff --git a/apps/openchallenges/rstudio/workspace/notebooks/example.Rmd b/apps/openchallenges/rstudio/workspace/notebooks/example.Rmd deleted file mode 100644 index aee8e4b035..0000000000 --- a/apps/openchallenges/rstudio/workspace/notebooks/example.Rmd +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "R Notebook" -output: html_notebook ---- - -This is an [R Markdown](http://rmarkdown.rstudio.com) Notebook. When you execute code within the notebook, the results appear beneath the code. - -Try executing this chunk by clicking the *Run* button within the chunk or by placing your cursor inside it and pressing *Ctrl+Shift+Enter*. - -```{r} -plot(cars) -``` - -Add a new chunk by clicking the *Insert Chunk* button on the toolbar or by pressing *Ctrl+Alt+I*. - -When you save the notebook, an HTML file containing the code and output will be saved alongside it (click the *Preview* button or press *Ctrl+Shift+K* to preview the HTML file). - -The preview shows you a rendered HTML copy of the contents of the editor. Consequently, unlike *Knit*, *Preview* does not run any R code chunks. Instead, the output of the chunk when it was last run in the editor is displayed. diff --git a/apps/openchallenges/rstudio/workspace/notebooks/example.nb.html b/apps/openchallenges/rstudio/workspace/notebooks/example.nb.html deleted file mode 100644 index e0e700eae8..0000000000 --- a/apps/openchallenges/rstudio/workspace/notebooks/example.nb.html +++ /dev/null @@ -1,16096 +0,0 @@ - - - - - - - - - R Notebook - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -

- This is an R Markdown Notebook. When you execute - code within the notebook, the results appear beneath the code. -

-

- Try executing this chunk by clicking the Run button within the chunk or by placing - your cursor inside it and pressing Ctrl+Shift+Enter. -

- - - -
plot(cars)
- - - -

- Add a new chunk by clicking the Insert Chunk button on the toolbar or by pressing - Ctrl+Alt+I. -

-

- When you save the notebook, an HTML file containing the code and output will be saved - alongside it (click the Preview button or press Ctrl+Shift+K to preview - the HTML file). -

-

- The preview shows you a rendered HTML copy of the contents of the editor. Consequently, - unlike Knit, Preview does not run any R code chunks. Instead, the output - of the chunk when it was last run in the editor is displayed. -

- - -
- LS0tCnRpdGxlOiAiUiBOb3RlYm9vayIKb3V0cHV0OiBodG1sX25vdGVib29rCi0tLQoKVGhpcyBpcyBhbiBbUiBNYXJrZG93bl0oaHR0cDovL3JtYXJrZG93bi5yc3R1ZGlvLmNvbSkgTm90ZWJvb2suIFdoZW4geW91IGV4ZWN1dGUgY29kZSB3aXRoaW4gdGhlIG5vdGVib29rLCB0aGUgcmVzdWx0cyBhcHBlYXIgYmVuZWF0aCB0aGUgY29kZS4gCgpUcnkgZXhlY3V0aW5nIHRoaXMgY2h1bmsgYnkgY2xpY2tpbmcgdGhlICpSdW4qIGJ1dHRvbiB3aXRoaW4gdGhlIGNodW5rIG9yIGJ5IHBsYWNpbmcgeW91ciBjdXJzb3IgaW5zaWRlIGl0IGFuZCBwcmVzc2luZyAqQ3RybCtTaGlmdCtFbnRlciouIAoKYGBge3J9CnBsb3QoY2FycykKYGBgCgpBZGQgYSBuZXcgY2h1bmsgYnkgY2xpY2tpbmcgdGhlICpJbnNlcnQgQ2h1bmsqIGJ1dHRvbiBvbiB0aGUgdG9vbGJhciBvciBieSBwcmVzc2luZyAqQ3RybCtBbHQrSSouCgpXaGVuIHlvdSBzYXZlIHRoZSBub3RlYm9vaywgYW4gSFRNTCBmaWxlIGNvbnRhaW5pbmcgdGhlIGNvZGUgYW5kIG91dHB1dCB3aWxsIGJlIHNhdmVkIGFsb25nc2lkZSBpdCAoY2xpY2sgdGhlICpQcmV2aWV3KiBidXR0b24gb3IgcHJlc3MgKkN0cmwrU2hpZnQrSyogdG8gcHJldmlldyB0aGUgSFRNTCBmaWxlKS4KClRoZSBwcmV2aWV3IHNob3dzIHlvdSBhIHJlbmRlcmVkIEhUTUwgY29weSBvZiB0aGUgY29udGVudHMgb2YgdGhlIGVkaXRvci4gQ29uc2VxdWVudGx5LCB1bmxpa2UgKktuaXQqLCAqUHJldmlldyogZG9lcyBub3QgcnVuIGFueSBSIGNvZGUgY2h1bmtzLiBJbnN0ZWFkLCB0aGUgb3V0cHV0IG9mIHRoZSBjaHVuayB3aGVuIGl0IHdhcyBsYXN0IHJ1biBpbiB0aGUgZWRpdG9yIGlzIGRpc3BsYXllZC4K -
-
- - - - - - - - - - - - - - diff --git a/docker/openchallenges/serve-detach.sh b/docker/openchallenges/serve-detach.sh index 4df355700f..f6344fc51c 100755 --- a/docker/openchallenges/serve-detach.sh +++ b/docker/openchallenges/serve-detach.sh @@ -17,7 +17,6 @@ args=( --file docker/openchallenges/services/mysqld-exporter.yml --file docker/openchallenges/services/organization-service.yml --file docker/openchallenges/services/prometheus.yml - --file docker/openchallenges/services/rstudio.yml --file docker/openchallenges/services/service-registry.yml --file docker/openchallenges/services/thumbor.yml --file docker/openchallenges/services/zipkin.yml diff --git a/docker/openchallenges/services/rstudio.yml b/docker/openchallenges/services/rstudio.yml deleted file mode 100644 index c1e1fb81e9..0000000000 --- a/docker/openchallenges/services/rstudio.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - openchallenges-rstudio: - image: ghcr.io/sage-bionetworks/openchallenges-rstudio:${OPENCHALLENGES_VERSION:-local} - container_name: openchallenges-rstudio - restart: always - env_file: - - ../../../apps/openchallenges/rstudio/.env - volumes: - - ../../../apps/openchallenges/rstudio/workspace:/home/rstudio/workspace - networks: - - openchallenges - ports: - - '8787:8787' - -networks: - openchallenges: - name: openchallenges