projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17465-pysdk-storage-classes-support'
[arvados.git]
/
build
/
package-build-dockerfiles
/
centos7
/
Dockerfile
diff --git
a/build/package-build-dockerfiles/centos7/Dockerfile
b/build/package-build-dockerfiles/centos7/Dockerfile
index 916c4abbb0037562c34e2dd1ecc46a6cb0ed1f77..b2d32b6761a78231955bb14d1b691dfbccc0d79a 100644
(file)
--- a/
build/package-build-dockerfiles/centos7/Dockerfile
+++ b/
build/package-build-dockerfiles/centos7/Dockerfile
@@
-3,10
+3,10
@@
# SPDX-License-Identifier: AGPL-3.0
FROM centos:7
# SPDX-License-Identifier: AGPL-3.0
FROM centos:7
-MAINTAINER
Ward Vandewege <ward@curoverse.com
>
+MAINTAINER
Arvados Package Maintainers <packaging@arvados.org
>
# Install dependencies.
# Install dependencies.
-RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel
python-devel python-setuptools fuse-devel xz-libs git python-virtualenv wget
+RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel
fuse-devel xz-libs git wget pam-devel
# Install RVM
ADD generated/mpapis.asc /tmp/
# Install RVM
ADD generated/mpapis.asc /tmp/
@@
-16,6
+16,7
@@
RUN gpg --import --no-tty /tmp/mpapis.asc && \
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.5 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.5 && \
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.5 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.5 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.0.2 && \
/usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
# Install Bash 4.4.12 // see https://dev.arvados.org/issues/15612
/usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
# Install Bash 4.4.12 // see https://dev.arvados.org/issues/15612
@@
-30,26
+31,24
@@
RUN cd /usr/local/src \
&& ln -sf /usr/local/src/bash-4.4.12/bash /bin/bash
# Install golang binary
&& ln -sf /usr/local/src/bash-4.4.12/bash /bin/bash
# Install golang binary
-ADD generated/go1.1
2.7
.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.1
6.3
.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install nodejs and npm
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install nodejs and npm
-ADD generated/node-v
6.11.2
-linux-x64.tar.xz /usr/local/
-RUN ln -s /usr/local/node-v
6.11.2
-linux-x64/bin/* /usr/local/bin/
+ADD generated/node-v
10.23.1
-linux-x64.tar.xz /usr/local/
+RUN ln -s /usr/local/node-v
10.23.1
-linux-x64/bin/* /usr/local/bin/
# Need to "touch" RPM database to workaround bug in interaction between
# overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
# Need to "touch" RPM database to workaround bug in interaction between
# overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install rh-python36
-RUN scl enable rh-python36 "easy_install-3.6 pip" && easy_install-2.7 pip
+RUN touch /var/lib/rpm/* && yum -q -y install python3 python3-pip python3-devel
-# Add epel, we need it for the python-pam dependency
-RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN rpm -ivh epel-release-latest-7.noarch.rpm
+# Install virtualenv
+RUN /usr/bin/pip3 install 'virtualenv<20'
-RUN git clone --depth 1 git://git.
curoverse.com
/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
+RUN git clone --depth 1 git://git.
arvados.org
/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
# The version of setuptools that comes with CentOS is way too old
# The version of setuptools that comes with CentOS is way too old
-RUN pip
install --upgrade setuptools
+RUN pip
3 install 'setuptools<45'
ENV WORKSPACE /arvados
ENV WORKSPACE /arvados
-CMD ["
scl", "enable", "rh-python36", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target
centos7"]
+CMD ["
/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "
centos7"]