From a8dd7bdc09437bc5a04b80e1b5289495f36cac6e Mon Sep 17 00:00:00 2001
From: Kate Isaac <41767733+kweav@users.noreply.github.com>
Date: Mon, 4 Aug 2025 11:39:41 -0400
Subject: [PATCH 1/5] Update Dockerfile with a dev version of ottrpal

---
 base_ottr/Dockerfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
index c235424..56ac777 100644
--- a/base_ottr/Dockerfile
+++ b/base_ottr/Dockerfile
@@ -83,8 +83,15 @@ RUN gdebi --non-interactive quarto-linux-amd64.deb
 # cow needs this dependency:
 RUN Rscript -e  "devtools::install_version('gitcreds', version = '0.1.1', repos = 'http://cran.us.r-project.org')"
 
-RUN installGithub.r \
-  ottrproject/ottrpal
+# Install the 'remotes' package from CRAN
+RUN R -e "install.packages('remotes', repos = 'https://cran.rstudio.com/')"
+
+# Install the R package from a specific GitHub branch
+# Replace 'your_username', 'your_repo', and 'your_branch' with the actual values
+RUN R -e "remotes::install_github('ottrproject/ottrpal', ref = 'noTocLinkHandling')"
+
+#RUN installGithub.r \
+#  ottrproject/ottrpal
 
 # Set final workdir for commands
 WORKDIR /home/rstudio

From 5ee37f6215986af6f3433baba4d3bdea08de4061 Mon Sep 17 00:00:00 2001
From: Kate Isaac <41767733+kweav@users.noreply.github.com>
Date: Mon, 4 Aug 2025 12:43:42 -0400
Subject: [PATCH 2/5] Update Dockerfile to get rgoogleslides from archive

rgoogleslides no longer available on CRAN
---
 base_ottr/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
index 56ac777..4856a89 100644
--- a/base_ottr/Dockerfile
+++ b/base_ottr/Dockerfile
@@ -58,7 +58,6 @@ RUN Rscript -e  "options(warn = 2);install.packages( \
       'qpdf', \
       'R.utils', \
       'rprojroot', \
-      'rgoogleslides', \
       'googlesheets4', \
       'servr', \
       'spelling', \
@@ -83,6 +82,9 @@ RUN gdebi --non-interactive quarto-linux-amd64.deb
 # cow needs this dependency:
 RUN Rscript -e  "devtools::install_version('gitcreds', version = '0.1.1', repos = 'http://cran.us.r-project.org')"
 
+#rgoogleslides archived version from CRAN
+RUN Rscript -e "devtools::install_version('rgoogleslides', version = '0.3.2', repos = 'https://cran.us.r-project.org')"
+
 # Install the 'remotes' package from CRAN
 RUN R -e "install.packages('remotes', repos = 'https://cran.rstudio.com/')"
 

From a1e46e0e80b01406e8779daabadd908cca9a9e84 Mon Sep 17 00:00:00 2001
From: Kate Isaac <41767733+kweav@users.noreply.github.com>
Date: Mon, 4 Aug 2025 13:04:04 -0400
Subject: [PATCH 3/5] Update Dockerfile with another try at rgoogleslides

---
 base_ottr/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
index 4856a89..7f62448 100644
--- a/base_ottr/Dockerfile
+++ b/base_ottr/Dockerfile
@@ -83,7 +83,8 @@ RUN gdebi --non-interactive quarto-linux-amd64.deb
 RUN Rscript -e  "devtools::install_version('gitcreds', version = '0.1.1', repos = 'http://cran.us.r-project.org')"
 
 #rgoogleslides archived version from CRAN
-RUN Rscript -e "devtools::install_version('rgoogleslides', version = '0.3.2', repos = 'https://cran.us.r-project.org')"
+RUN Rscript -e  "options(warn = 2);install.packages( \
+    'https://cran.r-project.org/src/contrib/Archive/rgoogleslides/rgoogleslides_0.3.2.tar.gz')"
 
 # Install the 'remotes' package from CRAN
 RUN R -e "install.packages('remotes', repos = 'https://cran.rstudio.com/')"

From cbd030fe058233ce7452bd77e6195cec86b8e762 Mon Sep 17 00:00:00 2001
From: Kate Isaac <41767733+kweav@users.noreply.github.com>
Date: Fri, 8 Aug 2025 10:55:24 -0400
Subject: [PATCH 4/5] Update Dockerfile

restore main branch ottrpal
---
 base_ottr/Dockerfile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
index 7f62448..48ad6d7 100644
--- a/base_ottr/Dockerfile
+++ b/base_ottr/Dockerfile
@@ -89,12 +89,8 @@ RUN Rscript -e  "options(warn = 2);install.packages( \
 # Install the 'remotes' package from CRAN
 RUN R -e "install.packages('remotes', repos = 'https://cran.rstudio.com/')"
 
-# Install the R package from a specific GitHub branch
-# Replace 'your_username', 'your_repo', and 'your_branch' with the actual values
-RUN R -e "remotes::install_github('ottrproject/ottrpal', ref = 'noTocLinkHandling')"
-
-#RUN installGithub.r \
-#  ottrproject/ottrpal
+RUN installGithub.r \
+  ottrproject/ottrpal
 
 # Set final workdir for commands
 WORKDIR /home/rstudio

From bc47757f3cc6303de57f72802fe4ac5f87b53671 Mon Sep 17 00:00:00 2001
From: Kate Isaac <41767733+kweav@users.noreply.github.com>
Date: Fri, 8 Aug 2025 11:05:32 -0400
Subject: [PATCH 5/5] Update Dockerfile to remove remotes too

don't need remotes if not installing from a github branch
---
 base_ottr/Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/base_ottr/Dockerfile b/base_ottr/Dockerfile
index 48ad6d7..45869c7 100644
--- a/base_ottr/Dockerfile
+++ b/base_ottr/Dockerfile
@@ -85,10 +85,7 @@ RUN Rscript -e  "devtools::install_version('gitcreds', version = '0.1.1', repos
 #rgoogleslides archived version from CRAN
 RUN Rscript -e  "options(warn = 2);install.packages( \
     'https://cran.r-project.org/src/contrib/Archive/rgoogleslides/rgoogleslides_0.3.2.tar.gz')"
-
-# Install the 'remotes' package from CRAN
-RUN R -e "install.packages('remotes', repos = 'https://cran.rstudio.com/')"
-
+    
 RUN installGithub.r \
   ottrproject/ottrpal