diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2017-06-14 16:15:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 16:15:22 +0200 |
| commit | dd50cadd8e9b4b404e93a3a625fcfb86392a579e (patch) | |
| tree | c3dd670e7eab325a8eeb238a49ce3fd08403260b | |
| parent | 707aaf0d406518427d1f8c643cbf85a8535e6043 (diff) | |
| parent | 43f1aaf10b7b0f04e1dbeb0ce435eac75ef4f9cc (diff) | |
Merge pull request #2773 from yahoo/aressem/use-automatic-dependency-fetcher-when-building
Use yum-builddep to fetch direct build dependencies to avoid specifyi…
| -rw-r--r-- | docker/Dockerfile.build | 33 | ||||
| -rwxr-xr-x | docker/build-vespa-internal.sh | 1 | ||||
| -rwxr-xr-x | docker/vespa-ci-internal.sh | 1 |
3 files changed, 4 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 diff --git a/docker/vespa-ci-internal.sh b/docker/vespa-ci-internal.sh index caa64824044..a628550df75 100755 --- a/docker/vespa-ci-internal.sh +++ b/docker/vespa-ci-internal.sh @@ -19,6 +19,7 @@ mkdir "${BUILD_DIR}" git clone --no-checkout --local --no-hardlinks file:///vespa "${SOURCE_DIR}" cd "${SOURCE_DIR}" git checkout --detach ${GIT_COMMIT} +yum-builddep -y ./dist/vespa.spec source /opt/rh/devtoolset-6/enable || true sh ./bootstrap.sh full MAVEN_OPTS="-Xms512m -Xmx512m" mvn install |