Skip to content

Commit 21f5972

Browse files
committed
Try to fix Centos
1 parent d078eb3 commit 21f5972

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Workaround for ubuntu-18
2-
MAKEFLAGS = -j3
2+
#MAKEFLAGS = -j3
33

44
library:
55
# Builds the library with R packages.

docker/centos-7/Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,19 @@ ARG RSTUDIO=2023.12.0-369
66
# Enable Vault and install EPEL
77
RUN \
88
sed -i.bak 's@^mirrorlist@#mirrorlist@g' /etc/yum.repos.d/*.repo &&\
9-
sed -i.bak 's@#baseurl=http://mirror.centos.org@baseurl=http://vault.centos.org@g' /etc/yum.repos.d/*.repo &&\
9+
sed -i.bak 's@#.*baseurl=http://mirror.centos.org@baseurl=http://vault.centos.org@g' /etc/yum.repos.d/*.repo &&\
1010
yum update -y &&\
11-
yum install -y epel-release
11+
yum install -y epel-release centos-release-scl &&\
12+
sed -i.bak 's@^mirrorlist@#mirrorlist@g' /etc/yum.repos.d/*.repo &&\
13+
sed -i.bak 's@#.*baseurl=http://mirror.centos.org@baseurl=http://vault.centos.org@g' /etc/yum.repos.d/*.repo &&\
14+
yum install -y devtoolset-8 &&\
15+
rm -f /etc/yum.repos.d/*.bak
16+
17+
RUN \
18+
curl -fsSOL https://cdn.rstudio.com/r/centos-7/pkgs/R-4.5.0-1-1.x86_64.rpm &&\
19+
yum install -y R-4.5.0-1-1.x86_64.rpm
20+
21+
ENV PATH="/opt/rh/devtoolset-8/root/usr/bin/:/opt/R/4.5.0/bin:${PATH}"
1222

1323
# Install.
1424
RUN \
@@ -18,6 +28,7 @@ RUN \
1828
yum install -y rpm-build make wget tar httpd-devel libapreq2-devel R-devel libcurl-devel protobuf-devel openssl-devel libxml2-devel libicu-devel libssh2-devel cairo-devel createrepo cmake && \
1929
yum clean all
2030

31+
2132
USER builder
2233

2334
RUN \

0 commit comments

Comments
 (0)