From 9c348fb14ced2f9f942d8e21e8e9f375b0a4a72f Mon Sep 17 00:00:00 2001
From: sorinvoicu <61691256+sorinvoicu@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:49:11 +0000
Subject: [PATCH 1/2] update dependencies

---
 .github/workflows/build_push.yml | 34 +++++++++++---------------------
 Dockerfile                       |  5 +----
 scripts/install_r_pkgs.R         |  5 ++++-
 scripts/install_sys_deps.sh      |  3 ---
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index fb2765f..debd3c7 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -11,37 +11,25 @@ on:
   workflow_dispatch:
     inputs:
       r_version:
-        description: R Version
+        description: R Version (X.Y.Z)
         required: true
-        type: choice
-        default: "4.3.2"
-        options:
-          - "4.3.2"
-          - "latest"
+        default: ""
+        type: string
       quarto_version:
-        description: Quarto version
+        description: Quarto version (X.Y.Z)
         required: true
-        type: choice
-        default: "1.3.450"
-        options:
-          - "1.3.450"
-          - "latest"
+        default: "latest"
+        type: string
       pandoc_version:
-        description: Pandoc version
+        description: Pandoc version (X.Y.Z)
         required: true
-        type: choice
-        default: "2.9.2.1"
-        options:
-          - "2.9.2.1"
-          - "latest"
+        default: "latest"
+        type: string
       cran_snapshot_date:
         description: CRAN packages snapshot date (YYYY-MM-DD)
         required: true
-        type: choice
-        default: "2024-01-12"
-        options:
-          - "2024-01-12"
-          - "latest"
+        default: ""
+        type: string
       custom_tag:
         description: Custom image tag
         required: false
diff --git a/Dockerfile b/Dockerfile
index b627e43..cc9682c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,6 @@ ARG CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest
 ARG PANDOC_VERSION=2.9.2.1
 # https://github.com/quarto-dev/quarto-cli/tags
 ARG QUARTO_VERSION=1.3.450
-# https://github.com/lycheeverse/lychee-action/tags
-ARG LYCHEE_VERSION=0.14.3
 
 # Set up environment 
 ENV R_HOME=/usr/local/lib/R
@@ -25,8 +23,7 @@ COPY rocker_scripts/scripts /rocker_scripts
 RUN /rocker_scripts/install_R_source.sh && \
     /rocker_scripts/setup_R.sh && \
     /rocker_scripts/install_pandoc.sh && \
-    /rocker_scripts/install_quarto.sh && \
-    /rocker_scripts/install_texlive.sh
+    /rocker_scripts/install_quarto.sh 
 
 COPY scripts /scripts
 RUN /scripts/install_sys_deps.sh && \
diff --git a/scripts/install_r_pkgs.R b/scripts/install_r_pkgs.R
index 5aa139b..3ab7875 100755
--- a/scripts/install_r_pkgs.R
+++ b/scripts/install_r_pkgs.R
@@ -5,7 +5,7 @@ install.packages("pak")
 
 # Packages to install
 install_pkgs <- c(
-  "boehringer-ingelheim/davinci",
+  "tinytex",
   "rcmdcheck",
   "roxygen2",
   "lintr",
@@ -32,5 +32,8 @@ pak::pak(
   upgrade = FALSE
 )
 
+# Install tinytex
+tinytex::install_tinytex()
+
 # Remove DaVinci packages from image
 grep("^dv.", rownames(installed.packages()), value = TRUE) |> sapply(remove.packages)
diff --git a/scripts/install_sys_deps.sh b/scripts/install_sys_deps.sh
index fde8dd9..e301b2b 100755
--- a/scripts/install_sys_deps.sh
+++ b/scripts/install_sys_deps.sh
@@ -17,6 +17,3 @@ apt-get install -q -y ${pkgs_to_install}
 apt-get autoremove -y
 apt-get autoclean -y
 rm -rf /var/lib/apt/lists/*
-
-# Install lychee URL checker
-curl -Ls https://github.com/lycheeverse/lychee/releases/download/v"${LYCHEE_VERSION}"/lychee-v"${LYCHEE_VERSION}"-"$(arch)"-unknown-linux-gnu.tar.gz | tar xz -C /usr/local/bin

From f01e315962838290e6c249a24b6fe4c1c36338a7 Mon Sep 17 00:00:00 2001
From: sorinvoicu <61691256+sorinvoicu@users.noreply.github.com>
Date: Thu, 22 Aug 2024 20:00:59 +0000
Subject: [PATCH 2/2] update lychee version

---
 Dockerfile                  | 2 ++
 scripts/install_sys_deps.sh | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index cc9682c..405b446 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,8 @@ ARG CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest
 ARG PANDOC_VERSION=2.9.2.1
 # https://github.com/quarto-dev/quarto-cli/tags
 ARG QUARTO_VERSION=1.3.450
+# https://github.com/lycheeverse/lychee/releases/
+ARG LYCHEE_VERSION=0.15.1
 
 # Set up environment 
 ENV R_HOME=/usr/local/lib/R
diff --git a/scripts/install_sys_deps.sh b/scripts/install_sys_deps.sh
index e301b2b..6db5377 100755
--- a/scripts/install_sys_deps.sh
+++ b/scripts/install_sys_deps.sh
@@ -17,3 +17,6 @@ apt-get install -q -y ${pkgs_to_install}
 apt-get autoremove -y
 apt-get autoclean -y
 rm -rf /var/lib/apt/lists/*
+
+# Install lychee URL checker
+curl -Ls https://github.com/lycheeverse/lychee/releases/download/v"${LYCHEE_VERSION}"/lychee-v"${LYCHEE_VERSION}"-"$(arch)"-unknown-linux-gnu.tar.gz | tar xz -C /usr/local/bin
\ No newline at end of file