Skip to content

Commit 2bfd5dd

Browse files
jeroenjeroen
committed
add fedora 31 and centos 8
1 parent 899bff3 commit 2bfd5dd

9 files changed

Lines changed: 90 additions & 12 deletions

File tree

‎docker/centos-7/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ RUN \
2323

2424
RUN \
2525
cd ~ && \
26-
wget https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
26+
wget --quiet https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
2727
tar xzvf rapache-1.2.9.tar.gz rapache-1.2.9/rpm/rapache.spec --strip-components 2 && \
2828
mv -f rapache-1.2.9.tar.gz ~/rpmbuild/SOURCES/ && \
2929
mv -f rapache.spec ~/rpmbuild/SPECS/ && \
3030
rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
3131

3232
RUN \
3333
cd ~ && \
34-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
34+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
3535
tar xzvf opencpu-server-${BRANCH}.tar.gz opencpu-server-${BRANCH}/rpm/opencpu.spec --strip-components 2 && \
3636
mv -f opencpu-server-${BRANCH}.tar.gz ~/rpmbuild/SOURCES/ && \
3737
mv -f opencpu.spec ~/rpmbuild/SPECS/ && \

‎docker/centos-8/Dockerfile‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
FROM centos:centos8
2+
3+
ENV BRANCH 2.1
4+
ENV RSTUDIO 1.2.5001
5+
6+
# Enable EPEL
7+
RUN \
8+
yum upgrade -y && \
9+
yum install -y 'dnf-command(config-manager)' && \
10+
yum install -y epel-release && \
11+
yum config-manager --enable PowerTools epel-testing
12+
13+
# Install.
14+
RUN \
15+
useradd -ms /bin/bash builder && \
16+
yum update -y && \
17+
yum upgrade -y && \
18+
yum install -y rpm-build make wget tar httpd-devel libapreq2-devel R-devel libcurl-devel protobuf-devel openssl-devel libxml2-devel libicu-devel createrepo && \
19+
yum clean all
20+
21+
USER builder
22+
23+
RUN \
24+
mkdir -p ~/rpmbuild/SOURCES && \
25+
mkdir -p ~/rpmbuild/SPECS
26+
27+
RUN \
28+
cd ~ && \
29+
wget --quiet https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
30+
tar xzvf rapache-1.2.9.tar.gz rapache-1.2.9/rpm/rapache.spec --strip-components 2 && \
31+
mv -f rapache-1.2.9.tar.gz ~/rpmbuild/SOURCES/ && \
32+
mv -f rapache.spec ~/rpmbuild/SPECS/ && \
33+
rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
34+
35+
RUN \
36+
cd ~ && \
37+
wget --quiet https://github.com/opencpu/opencpu-server/archive/master.tar.gz -O opencpu-server-master.tar.gz && \
38+
tar xzvf opencpu-server-master.tar.gz opencpu-server-master/rpm/opencpu.spec --strip-components 2 && \
39+
mv -f opencpu-server-master.tar.gz ~/rpmbuild/SOURCES/ && \
40+
mv -f opencpu.spec ~/rpmbuild/SPECS/ && \
41+
rpmbuild -ba ~/rpmbuild/SPECS/opencpu.spec --define "branch master"
42+
43+
RUN \
44+
createrepo ~/rpmbuild/RPMS/x86_64/
45+
46+
USER root
47+
48+
RUN \
49+
cp -Rf /home/builder/rpmbuild/RPMS ~/ && \
50+
cp -Rf /home/builder/rpmbuild/SRPMS ~/ && \
51+
userdel -r builder
52+
53+
RUN \
54+
yum install -y MTA mod_ssl /usr/sbin/semanage && \
55+
cd ~/RPMS/x86_64/ && \
56+
rpm -i rapache-*.rpm && \
57+
rpm -i opencpu-lib-*.rpm && \
58+
rpm -i opencpu-server-*.rpm
59+
60+
RUN \
61+
wget https://download2.rstudio.org/server/centos6/x86_64/rstudio-server-rhel-${RSTUDIO}-x86_64.rpm && \
62+
yum install -y --nogpgcheck rstudio-server-rhel-${RSTUDIO}-x86_64.rpm && \
63+
rm rstudio-server-rhel-${RSTUDIO}-x86_64.rpm && \
64+
echo "server-app-armor-enabled=0" >> /etc/rstudio/rserver.conf
65+
66+
RUN \
67+
yum remove -y httpd-devel libapreq2-devel && \
68+
yum clean all
69+
70+
# Apache ports
71+
EXPOSE 80
72+
EXPOSE 443
73+
EXPOSE 8004
74+
75+
# Define default command.
76+
CMD /usr/lib/rstudio-server/bin/rserver && apachectl -DFOREGROUND

‎docker/centos-8/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../README.md

‎docker/debian-10/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USER builder
2020

2121
RUN \
2222
cd ~ && \
23-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
23+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
2424
tar xzf v${BRANCH}.tar.gz && \
2525
cd opencpu-server-${BRANCH} && \
2626
sed -i 's/bionic/buster/g' debian/changelog && \

‎docker/debian-9/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USER builder
2020

2121
RUN \
2222
cd ~ && \
23-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
23+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
2424
tar xzf v${BRANCH}.tar.gz && \
2525
cd opencpu-server-${BRANCH} && \
2626
sed -i 's/bionic/stretch/g' debian/changelog && \

‎docker/fedora-30/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN \
88
useradd -ms /bin/bash builder && \
99
yum update -y && \
1010
yum upgrade -y && \
11-
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 createrepo && \
11+
yum install -y rpm-build make wget tar httpd-devel libapreq2-devel R-devel libcurl-devel protobuf-devel openssl-devel libxml2-devel libicu-devel createrepo && \
1212
yum clean all
1313

1414
USER builder
@@ -19,15 +19,15 @@ RUN \
1919

2020
RUN \
2121
cd ~ && \
22-
wget https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
22+
wget --quiet https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
2323
tar xzvf rapache-1.2.9.tar.gz rapache-1.2.9/rpm/rapache.spec --strip-components 2 && \
2424
mv -f rapache-1.2.9.tar.gz ~/rpmbuild/SOURCES/ && \
2525
mv -f rapache.spec ~/rpmbuild/SPECS/ && \
2626
rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
2727

2828
RUN \
2929
cd ~ && \
30-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
30+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
3131
tar xzvf opencpu-server-${BRANCH}.tar.gz opencpu-server-${BRANCH}/rpm/opencpu.spec --strip-components 2 && \
3232
mv -f opencpu-server-${BRANCH}.tar.gz ~/rpmbuild/SOURCES/ && \
3333
mv -f opencpu.spec ~/rpmbuild/SPECS/ && \

docker/fedora-29/Dockerfile renamed to docker/fedora-31/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:29
1+
FROM fedora:31
22

33
ENV BRANCH 2.1
44
ENV RSTUDIO 1.2.5001
@@ -8,7 +8,7 @@ RUN \
88
useradd -ms /bin/bash builder && \
99
yum update -y && \
1010
yum upgrade -y && \
11-
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 createrepo && \
11+
yum install -y rpm-build make wget tar httpd-devel libapreq2-devel R-devel libcurl-devel protobuf-devel openssl-devel libxml2-devel libicu-devel createrepo && \
1212
yum clean all
1313

1414
USER builder
@@ -19,15 +19,15 @@ RUN \
1919

2020
RUN \
2121
cd ~ && \
22-
wget https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
22+
wget --quiet https://github.com/jeffreyhorner/rapache/archive/v1.2.9.tar.gz -O rapache-1.2.9.tar.gz && \
2323
tar xzvf rapache-1.2.9.tar.gz rapache-1.2.9/rpm/rapache.spec --strip-components 2 && \
2424
mv -f rapache-1.2.9.tar.gz ~/rpmbuild/SOURCES/ && \
2525
mv -f rapache.spec ~/rpmbuild/SPECS/ && \
2626
rpmbuild -ba ~/rpmbuild/SPECS/rapache.spec
2727

2828
RUN \
2929
cd ~ && \
30-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
30+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz -O opencpu-server-${BRANCH}.tar.gz && \
3131
tar xzvf opencpu-server-${BRANCH}.tar.gz opencpu-server-${BRANCH}/rpm/opencpu.spec --strip-components 2 && \
3232
mv -f opencpu-server-${BRANCH}.tar.gz ~/rpmbuild/SOURCES/ && \
3333
mv -f opencpu.spec ~/rpmbuild/SPECS/ && \

‎docker/fedora-31/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../README.md

‎docker/ubuntu-18.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ USER builder
2222

2323
RUN \
2424
cd ~ && \
25-
wget https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
25+
wget --quiet https://github.com/opencpu/opencpu-server/archive/v${BRANCH}.tar.gz && \
2626
tar xzf v${BRANCH}.tar.gz && \
2727
cd opencpu-server-${BRANCH} && \
2828
dpkg-buildpackage -us -uc

0 commit comments

Comments
 (0)