generated from degauss-org/degauss_template
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update R, renv and dependency versions (#29)
* Update R version to 4.4.1, update renv version to 1.0.7 and use updated CRAN repo * Update dependency versions in renv lockfile * Restore missing entrypoint copy * Increment metadata version to 1.0.0 --------- Co-authored-by: Jerry Xiong <[email protected]>
- Loading branch information
Showing
2 changed files
with
355 additions
and
1,015 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
FROM rocker/r-ver:4.0.4 | ||
FROM rocker/r-ver:4.4.1 | ||
|
||
# DeGAUSS container metadata | ||
ENV degauss_name="census_block_group" | ||
ENV degauss_version="0.6.0" | ||
ENV degauss_version="1.0.0" | ||
ENV degauss_description="census block group and tract" | ||
ENV degauss_argument="census year [default: 2010]" | ||
|
||
|
@@ -12,12 +12,6 @@ LABEL "org.degauss.version"="${degauss_version}" | |
LABEL "org.degauss.description"="${degauss_description}" | ||
LABEL "org.degauss.argument"="${degauss_argument}" | ||
|
||
RUN R --quiet -e "install.packages('remotes', repos = c(CRAN = 'https://packagemanager.rstudio.com/all/__linux__/focal/latest'))" | ||
|
||
RUN R --quiet -e "remotes::install_github('rstudio/[email protected]')" | ||
|
||
WORKDIR /app | ||
|
||
RUN apt-get update \ | ||
&& apt-get install -yqq --no-install-recommends \ | ||
libgdal-dev \ | ||
|
@@ -26,9 +20,15 @@ RUN apt-get update \ | |
libproj-dev \ | ||
&& apt-get clean | ||
|
||
RUN R --quiet -e "install.packages('remotes', repo = c(CRAN = 'https://packagemanager.posit.co/cran/latest'))" | ||
|
||
RUN R --quiet -e "remotes::install_github('rstudio/[email protected]')" | ||
|
||
WORKDIR /app | ||
|
||
COPY renv.lock . | ||
|
||
RUN R --quiet -e "renv::restore(repos = c(CRAN = 'https://packagemanager.rstudio.com/all/__linux__/focal/latest'))" | ||
RUN R --quiet -e "renv::restore(repos = c(CRAN = 'https://packagemanager.posit.co/cran/latest'))" | ||
|
||
ADD https://geomarker.s3.us-east-2.amazonaws.com/geometries/block_groups_2020_5072.rds . | ||
ADD https://geomarker.s3.us-east-2.amazonaws.com/geometries/block_groups_2010_5072.rds . | ||
|
@@ -40,4 +40,4 @@ COPY entrypoint.R . | |
|
||
WORKDIR /tmp | ||
|
||
ENTRYPOINT ["/app/entrypoint.R"] | ||
ENTRYPOINT ["/app/entrypoint.R"] |
Oops, something went wrong.