From a1d4ab66c56e0150eb89f0deaafe2cb2a997b61b Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 26 May 2016 11:37:06 -0400 Subject: [PATCH] Package ruamel.yaml, which is a new dependency of schema-salad. No issue # --- build/package-build-dockerfiles/centos6/Dockerfile | 3 ++- build/package-build-dockerfiles/debian7/Dockerfile | 3 ++- build/package-build-dockerfiles/debian8/Dockerfile | 3 ++- build/package-build-dockerfiles/ubuntu1204/Dockerfile | 3 ++- build/package-build-dockerfiles/ubuntu1404/Dockerfile | 3 ++- build/package-test-dockerfiles/centos6/Dockerfile | 5 +++-- build/run-build-packages.sh | 4 ++++ 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile index 679f68e64e..5bfba408d8 100644 --- a/build/package-build-dockerfiles/centos6/Dockerfile +++ b/build/package-build-dockerfiles/centos6/Dockerfile @@ -13,7 +13,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundler fpm + /usr/local/rvm/bin/rvm-exec default gem install bundler && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Need to "touch" RPM database to workaround bug in interaction between # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602) diff --git a/build/package-build-dockerfiles/debian7/Dockerfile b/build/package-build-dockerfiles/debian7/Dockerfile index a62a9fea60..ccc444c314 100644 --- a/build/package-build-dockerfiles/debian7/Dockerfile +++ b/build/package-build-dockerfiles/debian7/Dockerfile @@ -9,7 +9,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundler fpm + /usr/local/rvm/bin/rvm-exec default gem install bundler && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary ADD generated/golang-amd64.tar.gz /usr/local/ diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile index f1f23f4fdf..e32cfb44a2 100644 --- a/build/package-build-dockerfiles/debian8/Dockerfile +++ b/build/package-build-dockerfiles/debian8/Dockerfile @@ -9,7 +9,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundler fpm + /usr/local/rvm/bin/rvm-exec default gem install bundler && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary ADD generated/golang-amd64.tar.gz /usr/local/ diff --git a/build/package-build-dockerfiles/ubuntu1204/Dockerfile b/build/package-build-dockerfiles/ubuntu1204/Dockerfile index 8f3997a131..34bf6985b0 100644 --- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile @@ -9,7 +9,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundler fpm + /usr/local/rvm/bin/rvm-exec default gem install bundler && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary ADD generated/golang-amd64.tar.gz /usr/local/ diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile index edd1207717..53771640ee 100644 --- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile @@ -9,7 +9,8 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundler fpm + /usr/local/rvm/bin/rvm-exec default gem install bundler && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary ADD generated/golang-amd64.tar.gz /usr/local/ diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile index 69927a1737..e48955117d 100644 --- a/build/package-test-dockerfiles/centos6/Dockerfile +++ b/build/package-test-dockerfiles/centos6/Dockerfile @@ -10,11 +10,12 @@ RUN touch /var/lib/rpm/* && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.1 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \ - /usr/local/rvm/bin/rvm-exec default gem install bundle fpm + /usr/local/rvm/bin/rvm-exec default gem install bundle && \ + /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b RUN cd /tmp && \ curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' && \ rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \ sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo -COPY localrepo.repo /etc/yum.repos.d/localrepo.repo \ No newline at end of file +COPY localrepo.repo /etc/yum.repos.d/localrepo.repo diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 2eacdf114c..dc428a0ef7 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -430,6 +430,10 @@ fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curover # Ward, 2016-03-17 fpm --maintainer='Ward Vandewege ' -s python -t $FORMAT --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -n "${PYTHON2_PKG_PREFIX}-schema-salad" --iteration 1 --python-bin python2.7 --python-easyinstall "$EASY_INSTALL2" --python-package-name-prefix "$PYTHON2_PKG_PREFIX" --depends "$PYTHON2_PACKAGE" -v 1.11.20160506154702 schema_salad +# And schema_salad now depends on ruamel-yaml, which apparently has a braindead setup.py that requires special arguments to build (otherwise, it aborts with 'error: you have to install with "pip install ."'). Sigh. +# Ward, 2016-05-26 +fpm --maintainer='Ward Vandewege ' -s python -t deb --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies --verbose --log info --iteration 1 --python-bin python2.7 --python-easyinstall easy_install-2.7 --python-package-name-prefix python --depends python2.7 --python-setup-py-arguments "--single-version-externally-managed" --debug ruamel.yaml + # And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17 fpm --maintainer='Ward Vandewege ' -s python -t $FORMAT --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -n "${PYTHON2_PKG_PREFIX}-cwltool" --iteration 1 --python-bin python2.7 --python-easyinstall "$EASY_INSTALL2" --python-package-name-prefix "$PYTHON2_PKG_PREFIX" --depends "$PYTHON2_PACKAGE" -v 1.0.20160519182434 cwltool -- 2.30.2