diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-03-11 17:36:51 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-03-11 17:36:51 +0100 |
| commit | 0af7e58f92c588c85ef1a5b73760c51294f632d7 (patch) | |
| tree | 64c4ba76a09db7a9b020c87b3b4a251a3439732a /docker | |
| parent | 0fd4e9e5702566e9d0976fe5f24392f92befa6a0 (diff) | |
Avoid changing dist.sh API which is documented in README.md
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build-vespa.sh | 2 | ||||
| -rwxr-xr-x | docker/build/build-vespa-internal.sh | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index 9e8db6ab215..844c8a99e55 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -20,4 +20,4 @@ docker pull ${DOCKER_IMAGE} docker run -w /vespa --rm -v $(pwd)/..:/vespa \ --entrypoint /vespa/docker/build/build-vespa-internal.sh \ "$DOCKER_IMAGE" \ - "$VESPA_VERSION" "$(id -u)" "$(id -g)" /tmp/rpmbuild /vespa/docker + "$VESPA_VERSION" "$(id -u)" "$(id -g)" diff --git a/docker/build/build-vespa-internal.sh b/docker/build/build-vespa-internal.sh index 1bef89d59b4..45301aa9347 100755 --- a/docker/build/build-vespa-internal.sh +++ b/docker/build/build-vespa-internal.sh @@ -3,15 +3,13 @@ set -e if [ $# -ne 5 ]; then - echo "Usage: $0 <vespa version> <caller uid> <caller gid> <tmp build dir> <rpm dest dir>" + echo "Usage: $0 <vespa version> <caller uid> <caller gid>" echo "This script should not be called manually." exit 1 fi VESPA_VERSION=$1 CALLER_UID=$2 CALLER_GID=$3 -BUILD_DIR=$4 -DEST_DIR=$5 if ! [ -x ./dist.sh ]; then echo ". is not a vespa-engine/vespa root directory" @@ -25,7 +23,7 @@ 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 --setopt="centos-sclo-rh-source.skip_if_unavailable=true" $BUILD_DIR/SPECS/vespa-${VESPA_VERSION}.spec -rpmbuild -bb $BUILD_DIR/SPECS/vespa-${VESPA_VERSION}.spec -chown ${CALLER_UID}:${CALLER_GID} $BUILD_DIR/RPMS/x86_64/*.rpm -mv $BUILD_DIR/RPMS/x86_64/*.rpm $DEST_DIR +yum-builddep -y --setopt="centos-sclo-rh-source.skip_if_unavailable=true" ~/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 docker |