Skip to content

R 4.0.0 #16

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

Merged
virtualstaticvoid merged 3 commits into from
Jun 17, 2020
Merged

R 4.0.0 #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a03602e
bump R version to 4.0.0
virtualstaticvoid Jun 17, 2020
269fe33
introduce CRAN_VERSION
virtualstaticvoid Jun 17, 2020
0663b8b
update readme for docker image tags
virtualstaticvoid Jun 17, 2020
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
Prev Previous commit
Next Next commit
introduce CRAN_VERSION 
valid values include cran35 and cran40
  • Loading branch information
@virtualstaticvoid
virtualstaticvoid committed Jun 17, 2020
commit 269fe3398976ed9c427200f63483393010f80363
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ARG HEROKU_VERSION
FROM heroku/heroku:$HEROKU_VERSION

ARG R_VERSION
ARG CRAN_VERSION

# Set default locale
ENV LANG C.UTF-8
Expand All @@ -16,7 +17,7 @@ COPY helpers.R /etc/R/helpers.R
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 \
&& UBUNTU_VERSION=$(lsb_release -c | awk '{print $2}') \
&& echo "deb https://cloud.r-project.org/bin/linux/ubuntu $UBUNTU_VERSION-cran35/" > /etc/apt/sources.list.d/cran.list \
&& echo "deb https://cloud.r-project.org/bin/linux/ubuntu $UBUNTU_VERSION-$CRAN_VERSION/" > /etc/apt/sources.list.d/cran.list \
&& apt-get update -q \
&& apt-get install -qy --no-install-recommends \
apt-transport-https \
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ build:
--pull \
--build-arg HEROKU_VERSION=$(HEROKU_VERSION) \
--build-arg R_VERSION=$(R_VERSION) \
--build-arg CRAN_VERSION=$(CRAN_VERSION) \
--label "heroku.version=$(HEROKU_VERSION)" \
--label "r.version=$(R_VERSION)" \
--label "git.sha=$(GIT_SHA)" \
Expand Down
1 change: 1 addition & 0 deletions Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
HEROKU_VERSION:=18-build.v27
R_VERSION:=4.0.0
CRAN_VERSION:=cran40

MAINTAINER:=Chris Stefano <[email protected]>
MAINTAINER_URL:=https://github.com/virtualstaticvoid/heroku-docker-r
Expand Down