Skip to content

Commit

Permalink
Merge pull request #625 from Sage-Bionetworks/FDS-2542-software-updates
Browse files Browse the repository at this point in the history
Fds 2542 software updates
  • Loading branch information
afwillia authored Nov 4, 2024
2 parents 53aa95c + 60cd3d6 commit 54f7c28
Show file tree
Hide file tree
Showing 6 changed files with 970 additions and 358 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
^.venv
^schematic$
^\.github$
^.*\.Rproj$
^\.Rproj\.user$
4 changes: 2 additions & 2 deletions .Rprofile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ source("renv/activate.R")
.First <- function() {
options(
repos = c(
CRAN = "https://cran.rstudio.com/",
Sage = "http://ran.synapse.org"
binaries = "https://packagemanager.posit.co/cran/__linux__/noble/latest",
CRAN = "https://cran.rstudio.com/"
),
sass.cache = FALSE, # turn of styling caching
stringsAsFactors = FALSE # no needed if R >= 4.0.0
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/afwillia/shiny-base:release-1.12
FROM ghcr.io/afwillia/shiny-base:release-1.13

# add version tag as a build argument
ARG DCA_VERSION
Expand All @@ -7,7 +7,7 @@ ENV DCA_VERSION=$DCA_VERSION

USER root
RUN apt-get update
RUN apt-get install -y libxml2 libglpk-dev libicu-dev libicu70 curl
RUN apt-get install -y libxml2 libglpk-dev libicu-dev curl

# overwrite the default config with our modified copy
COPY shiny-server.conf /etc/shiny-server/shiny-server.conf
Expand All @@ -20,6 +20,6 @@ COPY --chown=shiny ./ ./

# set up r packages via renv. Use binary lib matching the shiny-base ubuntu version
# to speed up installatioon.
RUN Rscript -e 'renv::restore(repos="https://packagemanager.rstudio.com/all/__linux__/jammy/latest"); renv::install("./")'
RUN Rscript -e 'renv::restore(repos="https://packagemanager.posit.co/cran/__linux__/noble/latest"); renv::install("./")'

CMD ["./dca_startup.sh"]
4 changes: 4 additions & 0 deletions Shiny_App.Rproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ Encoding: UTF-8

RnwWeave: Sweave
LaTeX: pdfLaTeX

BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
Loading

0 comments on commit 54f7c28

Please sign in to comment.