From aaded5709e0713c97136c554f542918dfaab76de Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Wed, 20 Dec 2023 10:39:17 -0800 Subject: [PATCH 1/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5bda01f..e0b59ad 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "image": "ghcr.io/boettiger-lab/nasa-tops:latest", - "runArgs": [ "--security-opt", "seccomp=unconfined" ] + "runArgs": [ "--security-opt", "seccomp=unconfined" ], "name": "NASA TOPS Environment", // build image as a github-action and grab instead; faster. // "build": { From b80f6f2e7a02f1826b62a44e0e78e0161721331d Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Wed, 20 Dec 2023 10:41:03 -0800 Subject: [PATCH 2/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5bda01f..e0b59ad 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "image": "ghcr.io/boettiger-lab/nasa-tops:latest", - "runArgs": [ "--security-opt", "seccomp=unconfined" ] + "runArgs": [ "--security-opt", "seccomp=unconfined" ], "name": "NASA TOPS Environment", // build image as a github-action and grab instead; faster. // "build": { From e50ffffaae54baa782e5afbece36ef10e52323b9 Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Wed, 20 Dec 2023 18:53:01 +0000 Subject: [PATCH 3/4] correct path ordering --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f9b6f95..63938dd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM ghcr.io/rocker-org/devcontainer/tidyverse:4.3 ENV NB_USER=rstudio ENV VIRTUAL_ENV=/opt/venv -ENV PATH=${PATH}:${VIRTUAL_ENV}/bin +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} ADD https://raw.githubusercontent.com/rocker-org/rocker-versioned2/c1a472465532c8349cf0ad4f3f95c86e85787dc3/scripts/install_python.sh install_python.sh RUN bash install_python.sh && rm install_python.sh From 917384f3952fbd4b9a1a05e6b45ab7c3bf7c375f Mon Sep 17 00:00:00 2001 From: Carl Boettiger Date: Wed, 20 Dec 2023 11:13:12 -0800 Subject: [PATCH 4/4] Update Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 63938dd..98264c9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ FROM ghcr.io/rocker-org/devcontainer/tidyverse:4.3 ENV NB_USER=rstudio ENV VIRTUAL_ENV=/opt/venv ENV PATH=${VIRTUAL_ENV}/bin:${PATH} -ADD https://raw.githubusercontent.com/rocker-org/rocker-versioned2/c1a472465532c8349cf0ad4f3f95c86e85787dc3/scripts/install_python.sh install_python.sh +ADD https://raw.githubusercontent.com/rocker-org/rocker-versioned2/96cdc36e3c6dcd17e7eb4b830ebd7d8147aedf51/scripts/install_python.sh install_python.sh RUN bash install_python.sh && rm install_python.sh