diff options
| author | Arnstein Ressem <aressem@oath.com> | 2017-10-04 09:11:45 +0000 |
|---|---|---|
| committer | Arnstein Ressem <aressem@oath.com> | 2017-10-04 09:11:45 +0000 |
| commit | c81fa080b32a754188307f2512814c5407098750 (patch) | |
| tree | 7a019805b3dc7fb01beca92e70dd9710a86ed4e1 /docker | |
| parent | c110e9aff4234599725eb3229207fd9a0c330a55 (diff) | |
Use plain CentOS base when building Vespa rpm.
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build-vespa.sh | 2 | ||||
| -rwxr-xr-x | docker/build/build-vespa-internal.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index 15a0df6a9e9..d19c1fc8dc4 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -11,7 +11,7 @@ DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) cd $DIR VESPA_VERSION=$1 -DOCKER_IMAGE="vespaengine/vespa-dev:latest" +DOCKER_IMAGE="centos:latest" docker pull ${DOCKER_IMAGE} docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build/build-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" "$(id -u)" "$(id -g)" diff --git a/docker/build/build-vespa-internal.sh b/docker/build/build-vespa-internal.sh index 9da687a2e00..7f448f087c5 100755 --- a/docker/build/build-vespa-internal.sh +++ b/docker/build/build-vespa-internal.sh @@ -13,6 +13,12 @@ CALLER_GID=$3 cd /vespa ./dist.sh ${VESPA_VERSION} + +yum -y install epel-release +yum -y install centos-release-scl +yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo + +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 |