From 6d4a6a3547762fa332de5ba7fb80003b9c38c399 Mon Sep 17 00:00:00 2001 From: jimrothstein Date: Thu, 24 Oct 2024 13:56:40 -0700 Subject: [PATCH] Remove additional .devcontainer related files --- .devcontainer/4.1/devcontainer.json | 76 ----------------------------- .devcontainer/4.2/devcontainer.json | 76 ----------------------------- .devcontainer/devcontainer.json | 76 ----------------------------- .devcontainer/postCreateCommand.sh | 11 ----- .devcontainer/rstudio-prefs.json | 8 --- .devcontainer/rstudio.sh | 5 -- 6 files changed, 252 deletions(-) delete mode 100644 .devcontainer/4.1/devcontainer.json delete mode 100644 .devcontainer/4.2/devcontainer.json delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/postCreateCommand.sh delete mode 100644 .devcontainer/rstudio-prefs.json delete mode 100644 .devcontainer/rstudio.sh diff --git a/.devcontainer/4.1/devcontainer.json b/.devcontainer/4.1/devcontainer.json deleted file mode 100644 index ab6ddfeeae..0000000000 --- a/.devcontainer/4.1/devcontainer.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - // https://containers.dev/implementors/json_reference/ - "name": "Admiral R-4.1 (RStudio) container", - "image": "ghcr.io/pharmaverse/admiralci-4.1:latest", - // Install Dev Container Features. More info: https://containers.dev/features - "containerEnv": { - "ROOT": "true", - "PASSWORD": "rstudio", - "DISABLE_AUTH": "true", - "RENV_AUTOLOADER_ENABLED": "false" - }, - "features": { - "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { - "version": "none", - "vscodeRSupport": "full", - "installRadian": true, - "installVscDebugger": true - }, - "ghcr.io/rocker-org/devcontainer-features/renv-cache:latest": {}, - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": true, - "configureZshAsDefaultShell": false, - "installOhMyZsh": true, - "username": "rstudio", - "upgradePackages": false - }, - "ghcr.io/mikaello/devcontainer-features/modern-shell-utils:1": {} - }, - "init": true, - "overrideCommand": false, - - "postCreateCommand": "bash ./.devcontainer/postCreateCommand.sh", - - "postAttachCommand": "$BROWSER \"https://${CODESPACE_NAME}-8787.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/\"; echo 'To open rstudio in your browser, just type rstudio in the terminal'", - - "customizations": { - "vscode": { - "settings": { - "r.rterm.linux": "/usr/local/bin/radian", - "r.bracketedPaste": true, - "editor.bracketPairColorization.enabled": true, - "editor.guides.bracketPairs": "active" - }, - "extensions": [ - "vsls-contrib.codetour", - "GitHub.copilot", - "GitHub.copilot-chat", - // R extensions - "ikuyadeu.r", - "REditorSupport.r-lsp", - // Extra extension - "streetsidesoftware.code-spell-checker", - "eamodio.gitlens", - "cweijan.vscode-office", - "donjayamanne.githistory", - "GitHub.vscode-github-actions", - "GitHub.vscode-pull-request-github", - "GitHub.remotehub", - "alefragnani.Bookmarks", - "vscode-icons-team.vscode-icons" - ] - } - }, - - // RStudio ports - "forwardPorts": [8787], - "portsAttributes": { - "8787": { - "label": "Rstudio", - "requireLocalPort": true, - "onAutoForward": "openBrowser" - } - }, - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root - "remoteUser": "rstudio" -} diff --git a/.devcontainer/4.2/devcontainer.json b/.devcontainer/4.2/devcontainer.json deleted file mode 100644 index decbcca545..0000000000 --- a/.devcontainer/4.2/devcontainer.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - // https://containers.dev/implementors/json_reference/ - "name": "Admiral R-4.2 (RStudio) container", - "image": "ghcr.io/pharmaverse/admiralci-4.2:latest", - // Install Dev Container Features. More info: https://containers.dev/features - "containerEnv": { - "ROOT": "true", - "PASSWORD": "rstudio", - "DISABLE_AUTH": "true", - "RENV_AUTOLOADER_ENABLED": "false" - }, - "features": { - "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { - "version": "none", - "vscodeRSupport": "full", - "installRadian": true, - "installVscDebugger": true - }, - "ghcr.io/rocker-org/devcontainer-features/renv-cache:latest": {}, - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": true, - "configureZshAsDefaultShell": false, - "installOhMyZsh": true, - "username": "rstudio", - "upgradePackages": false - }, - "ghcr.io/mikaello/devcontainer-features/modern-shell-utils:1": {} - }, - "init": true, - "overrideCommand": false, - - "postCreateCommand": "bash ./.devcontainer/postCreateCommand.sh", - - "postAttachCommand": "$BROWSER \"https://${CODESPACE_NAME}-8787.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/\"; echo 'To open rstudio in your browser, just type rstudio in the terminal'", - - "customizations": { - "vscode": { - "settings": { - "r.rterm.linux": "/usr/local/bin/radian", - "r.bracketedPaste": true, - "editor.bracketPairColorization.enabled": true, - "editor.guides.bracketPairs": "active" - }, - "extensions": [ - "vsls-contrib.codetour", - "GitHub.copilot", - "GitHub.copilot-chat", - // R extensions - "ikuyadeu.r", - "REditorSupport.r-lsp", - // Extra extension - "streetsidesoftware.code-spell-checker", - "eamodio.gitlens", - "cweijan.vscode-office", - "donjayamanne.githistory", - "GitHub.vscode-github-actions", - "GitHub.vscode-pull-request-github", - "GitHub.remotehub", - "alefragnani.Bookmarks", - "vscode-icons-team.vscode-icons" - ] - } - }, - - // RStudio ports - "forwardPorts": [8787], - "portsAttributes": { - "8787": { - "label": "Rstudio", - "requireLocalPort": true, - "onAutoForward": "openBrowser" - } - }, - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root - "remoteUser": "rstudio" -} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 3f47589f32..0000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - // https://containers.dev/implementors/json_reference/ - "name": "Admiral R-4.3 (RStudio) container", - "image": "ghcr.io/pharmaverse/admiralci-4.3:latest", - // Install Dev Container Features. More info: https://containers.dev/features - "containerEnv": { - "ROOT": "true", - "PASSWORD": "rstudio", - "DISABLE_AUTH": "true", - "RENV_AUTOLOADER_ENABLED": "false" - }, - "features": { - "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { - "version": "none", - "vscodeRSupport": "full", - "installRadian": true, - "installVscDebugger": true - }, - "ghcr.io/rocker-org/devcontainer-features/renv-cache:latest": {}, - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": true, - "configureZshAsDefaultShell": false, - "installOhMyZsh": true, - "username": "rstudio", - "upgradePackages": false - }, - "ghcr.io/mikaello/devcontainer-features/modern-shell-utils:1": {} - }, - "init": true, - "overrideCommand": false, - - "postCreateCommand": "bash ./.devcontainer/postCreateCommand.sh", - - "postAttachCommand": "$BROWSER \"https://${CODESPACE_NAME}-8787.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/\"; echo 'To open rstudio in your browser, just type rstudio in the terminal'", - - "customizations": { - "vscode": { - "settings": { - "r.rterm.linux": "/usr/local/bin/radian", - "r.bracketedPaste": true, - "editor.bracketPairColorization.enabled": true, - "editor.guides.bracketPairs": "active" - }, - "extensions": [ - "vsls-contrib.codetour", - "GitHub.copilot", - "GitHub.copilot-chat", - // R extensions - "ikuyadeu.r", - "REditorSupport.r-lsp", - // Extra extension - "streetsidesoftware.code-spell-checker", - "eamodio.gitlens", - "cweijan.vscode-office", - "donjayamanne.githistory", - "GitHub.vscode-github-actions", - "GitHub.vscode-pull-request-github", - "GitHub.remotehub", - "alefragnani.Bookmarks", - "vscode-icons-team.vscode-icons" - ] - } - }, - - // RStudio ports - "forwardPorts": [8787], - "portsAttributes": { - "8787": { - "label": "Rstudio", - "requireLocalPort": true, - "onAutoForward": "openBrowser" - } - }, - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root - "remoteUser": "rstudio" -} diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh deleted file mode 100644 index 8dfe4e236e..0000000000 --- a/.devcontainer/postCreateCommand.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# move script rstudio into /usr/bin -sudo cp "$(pwd)/.devcontainer/rstudio.sh" /usr/bin/rstudio -sudo chmod +x /usr/bin/rstudio - -# Restore renv and install staged dependencies -R -q -e 'renv::restore(lockfile = file.path("renv", "profiles", paste(R.version$major, substr(R.version$minor, 1, 1), sep = "."), "renv.lock")); staged.dependencies::install_deps(staged.dependencies::dependency_table(project = ".", verbose = 1), verbose = 1);' - -# Define rstudio default working directory -jq --arg folder "$(pwd)/" '. + { "initial_working_directory": $folder }' .devcontainer/rstudio-prefs.json > ~/.config/rstudio/rstudio-prefs.json diff --git a/.devcontainer/rstudio-prefs.json b/.devcontainer/rstudio-prefs.json deleted file mode 100644 index 2d5cce8464..0000000000 --- a/.devcontainer/rstudio-prefs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "save_workspace": "never", - "always_save_history": false, - "reuse_sessions_for_project_links": true, - "posix_terminal_shell": "bash", - "initial_working_directory": "/workspaces", - "show_hidden_files": true -} diff --git a/.devcontainer/rstudio.sh b/.devcontainer/rstudio.sh deleted file mode 100644 index 053a247b5b..0000000000 --- a/.devcontainer/rstudio.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -$BROWSER "https://${CODESPACE_NAME}-8787.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}" - -exit 1