diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-06-14 15:19:49 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-06-14 15:19:49 +0200 |
commit | 3b1c13be2f04ad630c69ebff3c3c177895a5d3d0 (patch) | |
tree | ef9a5dfecf061078e9a3e3ae45fc5d592ce44e0a | |
parent | e3c6ab4ce1f42c348c04e1f35a4a1a2e647e3256 (diff) |
Use yum-builddep to fetch direct build dependencies to avoid specifying this multiple places.
-rw-r--r-- | docker/Dockerfile.build | 33 | ||||
-rwxr-xr-x | docker/build-vespa-internal.sh | 1 |
2 files changed, 3 insertions, 31 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 9aa35f2bd99..ecf4b5697fc 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -4,39 +4,10 @@ FROM centos:7 RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ yum -y install epel-release && \ yum -y install centos-release-scl && \ - yum -y --enablerepo=epel-testing install \ - devtoolset-6-gcc-c++ \ - devtoolset-6-libatomic-devel \ - devtoolset-6-binutils \ - git \ - make \ - cmake3 \ + yum -y install git \ ccache \ - Judy-devel \ - lz4-devel \ - libzstd-devel \ - zlib-devel \ - maven \ - libicu-devel \ - llvm3.9-devel \ - llvm3.9-static \ - java-1.8.0-openjdk-devel \ - openssl \ - openssl-devel \ rpm-build \ - perl \ - perl-Env \ - perl-JSON \ - perl-IO-Socket-IP \ - perl-Data-Dumper \ - perl-libwww-perl \ - perl-Net-INET6Glue \ - perl-URI \ - sudo \ - vespa-boost-devel \ - vespa-libtorrent-devel \ - vespa-zookeeper-c-client-devel \ - vespa-cppunit-devel && \ + sudo && \ echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf diff --git a/docker/build-vespa-internal.sh b/docker/build-vespa-internal.sh index f79e936c800..8fd288d1954 100755 --- a/docker/build-vespa-internal.sh +++ b/docker/build-vespa-internal.sh @@ -12,6 +12,7 @@ CALLER_GID=$3 cd /vespa ./dist.sh ${VESPA_VERSION} +yum-builddep -y ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec rpmbuild -bb ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec chown ${CALLER_UID}:${CALLER_GID} ~/rpmbuild/RPMS/x86_64/*.rpm mv ~/rpmbuild/RPMS/x86_64/*.rpm /vespa/docker |