Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update R, renv and dependency versions #29

Merged
merged 4 commits into from
Aug 20, 2024
Merged

Update R, renv and dependency versions #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
380ad41
Update R version to 4.4.1, update renv version to 1.0.7 and use updat…
Aug 19, 2024
d476f89
Update dependency versions in renv lockfile
Aug 19, 2024
b3c9500
Restore missing entrypoint copy
Aug 19, 2024
0a82230
Increment metadata version to 1.0.0
Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Dockerfile
View file
Open in desktop
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"
cole-brokamp marked this conversation as resolved.
Show resolved Hide resolved
ENV degauss_argument="census year [default: 2010]"

Expand All @@ -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 \
Expand All @@ -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 .
Expand All @@ -40,4 +40,4 @@ COPY entrypoint.R .

WORKDIR /tmp

ENTRYPOINT ["/app/entrypoint.R"]
ENTRYPOINT ["/app/entrypoint.R"]
Loading
Loading