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

Add R 3.6.0 #20

Merged
merged 3 commits into from
Apr 29, 2019
Merged

Add R 3.6.0 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d66c497
Add R 3.6.0
glin Apr 26, 2019
e01694a
Add support for installing packages with C++11 on CentOS 6
glin Apr 26, 2019
fd2e20f
Update Dockerfiles
glin Apr 26, 2019
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
6 changes: 6 additions & 0 deletions 3.1/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-$
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
6 changes: 6 additions & 0 deletions 3.2/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-$
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
6 changes: 6 additions & 0 deletions 3.3/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-$
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
6 changes: 6 additions & 0 deletions 3.4/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-$
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
6 changes: 6 additions & 0 deletions 3.5/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-$
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
22 changes: 22 additions & 0 deletions 3.6/bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:bionic

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=ubuntu-1804

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

CMD ["R"]
28 changes: 28 additions & 0 deletions 3.6/centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:centos6

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=centos-6

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
22 changes: 22 additions & 0 deletions 3.6/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:centos7

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=centos-7

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

CMD ["R"]
22 changes: 22 additions & 0 deletions 3.6/opensuse15/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:opensuse15

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=opensuse-15

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

CMD ["R"]
22 changes: 22 additions & 0 deletions 3.6/opensuse42/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:opensuse42

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=opensuse-42

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

CMD ["R"]
22 changes: 22 additions & 0 deletions 3.6/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:xenial

ARG R_VERSION=3.6.0
ARG OS_IDENTIFIER=ubuntu-1604

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

CMD ["R"]
22 changes: 22 additions & 0 deletions Dockerfile-centos6.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ARG BASE_IMAGE=rstudio/r-base
FROM ${BASE_IMAGE}:%%VARIANT%%

ARG R_VERSION=%%R_VERSION%%
ARG OS_IDENTIFIER=%%OS_IDENTIFIER%%

# Install R
RUN wget -O R-${R_VERSION}.tar.gz https://cdn.rstudio.com/r/${OS_IDENTIFIER}/R-${R_VERSION}-${OS_IDENTIFIER}.tar.gz && \
mkdir -p /opt/R && \
tar zx -C /opt/R -f ./R-${R_VERSION}.tar.gz && \
ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \
ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \
ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \
rm R-${R_VERSION}.tar.gz

# Add support for installing packages with C++11
RUN echo $'CXX11 = g++\n\
CXX11FLAGS = -g -O2 $(LTO)\n\
CXX11PICFLAGS = -fpic\n\
CXX11STD = -std=gnu++11\n' >> $(R RHOME)/etc/Makevars.site

CMD ["R"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BASE_IMAGE ?= rstudio/r-base
VERSIONS = 3.1 3.2 3.3 3.4 3.5
VERSIONS = 3.1 3.2 3.3 3.4 3.5 3.6
VARIANTS = xenial bionic centos6 centos7 opensuse42 opensuse15

all: build-all test-all
Expand Down
5 changes: 4 additions & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ declare -A r_versions=(
[3.3]='3.3.3'
[3.4]='3.4.4'
[3.5]='3.5.3'
[3.6]='3.6.0'
)

declare -A os_identifiers=(
Expand Down Expand Up @@ -38,7 +39,9 @@ for version in "${!r_versions[@]}"; do
case "$variant" in
xenial|bionic) template='ubuntu'
;;
centos6|centos7) template='centos'
centos6) template='centos6'
;;
centos7) template='centos'
;;
opensuse42|opensuse15) template='opensuse'
;;
Expand Down