update bake

bakefiles/bakefile.json

@@ -6,37 +6,37 @@
     },
     "radian": {
       "context": ".",
-      "dockerfile": "images/radian_4.3.3/Dockerfile",
-      "tags": ["mattocci/radian:4.3.3"],
+      "dockerfile": "images/radian_4.3.2/Dockerfile",
+      "tags": ["mattocci/radian:4.3.2"],
       "platforms": ["linux/amd64", "linux/arm64"],
-      "cache-from": ["docker.io/mattocci/radian:4.3.3"],
+      "cache-from": ["docker.io/mattocci/radian:4.3.2"],
       "cache-to": ["type=inline"],
       "output": ["type=registry,push=true"]
     },
     "radian-verse": {
       "context": ".",
-      "dockerfile": "images/radian-verse_4.3.3/Dockerfile",
-      "tags": ["mattocci/radian-verse:4.3.3"],
+      "dockerfile": "images/radian-verse_4.3.2/Dockerfile",
+      "tags": ["mattocci/radian-verse:4.3.2"],
       "platforms": ["linux/amd64", "linux/arm64"],
-      "cache-from": ["docker.io/mattocci/radian-verse:4.3.3"],
+      "cache-from": ["docker.io/mattocci/radian-verse:4.3.2"],
       "cache-to": ["type=inline"],
       "output": ["type=registry,push=true"]
     },
     "cmdstan-verse": {
       "context": ".",
-      "dockerfile": "images/cmdstan-verse_4.3.3/Dockerfile",
-      "tags": ["mattocci/cmdstan-verse:4.3.3"],
+      "dockerfile": "images/cmdstan-verse_4.3.2/Dockerfile",
+      "tags": ["mattocci/cmdstan-verse:4.3.2"],
       "platforms": ["linux/amd64", "linux/arm64"],
-      "cache-from": ["docker.io/mattocci/cmdstan-verse:4.3.3"],
+      "cache-from": ["docker.io/mattocci/cmdstan-verse:4.3.2"],
       "cache-to": ["type=inline"],
       "output": ["type=registry,push=true"]
     },
     "cmdstan-verse-zsh": {
       "context": ".",
-      "dockerfile": "images/cmdstan-verse-zsh_4.3.3/Dockerfile",
-      "tags": ["mattocci/cmdstan-verse-zsh:4.3.3"],
+      "dockerfile": "images/cmdstan-verse-zsh_4.3.2/Dockerfile",
+      "tags": ["mattocci/cmdstan-verse-zsh:4.3.2"],
       "platforms": ["linux/amd64", "linux/arm64"],
-      "cache-from": ["docker.io/mattocci/cmdstan-verse-zsh:4.3.3"],
+      "cache-from": ["docker.io/mattocci/cmdstan-verse-zsh:4.3.2"],
       "cache-to": ["type=inline"],
       "output": ["type=registry,push=true"]
     }

images/radian-verse_4.3.2/Dockerfile

@@ -26,21 +26,7 @@ RUN install2.r -n -2 --skipinstalled --error \
 
 USER rstudio
 
-# Determine architecture and install TinyTeX accordingly
-RUN arch=$(uname -m) && \
-    if [ "$arch" = "x86_64" ]; then \
-        wget --no-check-certificate -qO /tmp/install-tinytex.sh "https://yihui.org/gh/tinytex/tools/install-unx.sh" && \
-        chmod +x /tmp/install-tinytex.sh && \
-        /tmp/install-tinytex.sh; \
-    elif [ "$arch" = "aarch64" ]; then \
-        wget --no-check-certificate -qO /tmp/install-tl.tar.gz http://mirrors.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz && \
-        mkdir /tmp/install-tl && \
-        tar -xzf /tmp/install-tl.tar.gz -C /tmp/install-tl --strip-components=1 && \
-        /tmp/install-tl/install-tl --profile=/tmp/install-tl/texlive.profile; \
-    else \
-        echo "Unsupported architecture"; \
-        exit 1; \
-    fi
+RUN wget --no-check-certificate -qO- "https://yihui.org/gh/tinytex/tools/install-unx.sh" | sh
 
 ENV PATH="/home/rstudio/bin/:$PATH"
 

templates/Dockerfile.jinja

@@ -47,21 +47,7 @@ RUN install2.r -n -2 --skipinstalled --error \
 
 USER rstudio
 
-# Determine architecture and install TinyTeX accordingly
-RUN arch=$(uname -m) && \
-    if [ "$arch" = "x86_64" ]; then \
-        wget --no-check-certificate -qO /tmp/install-tinytex.sh "https://yihui.org/gh/tinytex/tools/install-unx.sh" && \
-        chmod +x /tmp/install-tinytex.sh && \
-        /tmp/install-tinytex.sh; \
-    elif [ "$arch" = "aarch64" ]; then \
-        wget --no-check-certificate -qO /tmp/install-tl.tar.gz http://mirrors.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz && \
-        mkdir /tmp/install-tl && \
-        tar -xzf /tmp/install-tl.tar.gz -C /tmp/install-tl --strip-components=1 && \
-        /tmp/install-tl/install-tl --profile=/tmp/install-tl/texlive.profile; \
-    else \
-        echo "Unsupported architecture"; \
-        exit 1; \
-    fi
+RUN wget --no-check-certificate -qO- "https://yihui.org/gh/tinytex/tools/install-unx.sh" | sh
 
 ENV PATH="/home/rstudio/bin/:$PATH"