Merge pull request #153 from miraisolutions/feature/152-version-stabl…

…e-tinytex

Version-stable TinyTeX

.Rbuildignore

@@ -6,6 +6,7 @@
 
 ^.*\.Rproj$
 ^Dockerfile$
+^\.dockerignore$
 ^docker$
 ^cloudbuild\.yaml$
 ^gke$

.dockerignore

@@ -0,0 +1,8 @@
+# Exclude hidden files/dirs to cover items related to git checkout, R project
+# and R session, which would be present in local builds and affect caching
+.*
+# .Rbuildignore however is relevant for the package build and must be kept
+!.Rbuildignore
+
+# Exclude the Dockerfile so that it does not affect caching either
+Dockerfile

Dockerfile

@@ -27,12 +27,18 @@ ENV PANDOC_DEB="2.3.1/pandoc-2.3.1-1-amd64.deb"
 COPY docker/install_pandoc.sh .
 RUN sh install_pandoc.sh $PANDOC_DEB && rm install_pandoc.sh
 
-## Install TinyTeX as LaTeX installation, including the app-specific dependencies
-# NOTE: it is important to install all required LaTeX packages when building the image!
+## Install TinyTeX as LaTeX installation
 COPY docker/install_tinytex.sh .
+# - Use a version-stable tlnet archive CTAN repo from texlive.info
+#   - here we consider the frozen TeXLive 2016 snapshot, corresponding to the TeXLive release
+#     shipped as texlive-* in Debian stretch (base image for the rocker/verse currently used)
+#   - note that https was not supported in TeXLive 2016 for the CTAN repository
+ENV CTAN_REPO=http://www.texlive.info/tlnet-archive/2017/04/13/tlnet
+# - It is important to also install all required LaTeX packages when building the image
 RUN sh install_tinytex.sh fancyhdr
 ## Script for re-installation of TinyTeX in the running container
-#  - needed if at a certain point the "Remote repository is newer than local"
+#  - needed if at a certain point the "Remote repository is newer than local",
+#    for non-version-stable TinyTeX installations
 #  - this also (re-)executes (and therefore depends on) install_tinytex.sh
 COPY docker/reinstall_tinytex.sh .
 

NEWS.md

@@ -3,7 +3,7 @@
 ### Changes
 
 * The app now uses custom collapsible panels, removing the dependency on shinydashboardPlus (#113).
-* The Dockerfile for the deployed app was improved, and is now based on R 3.5.3 (#91).
+* The Dockerfile for the deployed app was improved, and is now based on R 3.5.3 (#91, #152).
 * The total retirement fund text in the app was improved (#114).
 * The PDF report now uses A4 as pages size (#131).
 * The increment of interest rates in the app is now aligned to 0.1% (#142).

docker/Dockerfile-test-scripts

@@ -23,8 +23,11 @@ RUN sh install_pandoc.sh $PANDOC_DEB
 
 # TinyTeX
 COPY docker/install_tinytex.sh .
+# Use the frozen TeXLive 2018 snapshot as version-stable tlnet CTAN archive
+ENV CTAN_REPO=http://www.texlive.info/tlnet-archive/2019/02/27/tlnet
 RUN sh install_tinytex.sh fancyhdr
 
 # Re-installation of TinyTeX, to be used inside a running container in case the
-# TeXLive local repo becomes obsolete (Remote repository is newer than local)
+# TeXLive local repo becomes obsolete (Remote repository is newer than local),
+# in case of non-version-stable TinyTeX installs
 COPY docker/reinstall_tinytex.sh .