From 743e43a433714fabe8405147c313f904e566ff51 Mon Sep 17 00:00:00 2001 From: Eli Holmes - NOAA Date: Tue, 8 Oct 2024 16:03:44 -0700 Subject: [PATCH] try rocker_scripts at / --- rocker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rocker.sh b/rocker.sh index 5fe33e9..986fb16 100644 --- a/rocker.sh +++ b/rocker.sh @@ -11,8 +11,8 @@ R_VERSION="4.4.1" cd ${REPO_DIR} wget https://github.com/rocker-org/rocker-versioned2/archive/refs/tags/R${R_VERSION}.tar.gz tar zxvf R${R_VERSION}.tar.gz && \ -mv rocker-versioned2-R${R_VERSION}/scripts rocker_scripts && \ -mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile rocker_scripts/verse_${R_VERSION}.Dockerfile && \ +mv rocker-versioned2-R${R_VERSION}/scripts /rocker_scripts && \ +mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile /rocker_scripts/verse_${R_VERSION}.Dockerfile && \ rm R${R_VERSION}.tar.gz && \ rm -rf rocker-versioned2-R${R_VERSION} @@ -27,6 +27,6 @@ while IFS= read -r line; do cmd=$(echo "$line" | sed 's/^RUN //g') full_cmd="${REPO_DIR}${cmd}" echo "Executing: $full_cmd" - eval "$full_cmd" + eval "$cmd" fi done < rocker_scripts/verse_${R_VERSION}.Dockerfile