From: Ward Vandewege Date: Sun, 20 Jan 2019 18:12:45 +0000 (-0500) Subject: 9945: there is a new rvm gpg key X-Git-Tag: 1.3.1~2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7d14d47afbb36ed879fd007eba59b211a1136f10 9945: there is a new rvm gpg key Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index cdd44d9c57..5232050213 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -30,9 +30,10 @@ ubuntu1804/generated: common-generated-all GOTARBALL=go1.10.1.linux-amd64.tar.gz NODETARBALL=node-v6.11.2-linux-x64.tar.xz -RVMKEY=rvm.asc +RVMKEY1=mpapis.asc +RVMKEY2=pkuczynski.asc -common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY) +common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY1) common-generated/$(RVMKEY2) common-generated/$(GOTARBALL): common-generated wget -cqO common-generated/$(GOTARBALL) http://storage.googleapis.com/golang/$(GOTARBALL) @@ -40,8 +41,11 @@ common-generated/$(GOTARBALL): common-generated common-generated/$(NODETARBALL): common-generated wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v6.11.2/$(NODETARBALL) -common-generated/$(RVMKEY): common-generated - wget -cqO common-generated/$(RVMKEY) https://rvm.io/mpapis.asc +common-generated/$(RVMKEY1): common-generated + wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc + +common-generated/$(RVMKEY2): common-generated + wget -cqO common-generated/$(RVMKEY2) https://rvm.io/pkuczynski.asc common-generated: mkdir common-generated diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile index ba616eef1a..29abd43ebf 100644 --- a/build/package-build-dockerfiles/centos7/Dockerfile +++ b/build/package-build-dockerfiles/centos7/Dockerfile @@ -9,8 +9,10 @@ MAINTAINER Ward Vandewege RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel python-devel python-setuptools fuse-devel xz-libs git # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile index 1244e3f55d..f8835c56dc 100644 --- a/build/package-build-dockerfiles/debian8/Dockerfile +++ b/build/package-build-dockerfiles/debian8/Dockerfile @@ -11,8 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev python-pip unzip # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-build-dockerfiles/debian9/Dockerfile b/build/package-build-dockerfiles/debian9/Dockerfile index 42094d53bb..9a3caf4673 100644 --- a/build/package-build-dockerfiles/debian9/Dockerfile +++ b/build/package-build-dockerfiles/debian9/Dockerfile @@ -12,8 +12,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev python-pip unzip # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --no-tty --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile index a6bf65bc11..014c48fe99 100644 --- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile @@ -11,8 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile index 17bf89f3b6..8b0468b210 100644 --- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile @@ -11,8 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip tzdata # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile index c66de46908..be134f7539 100644 --- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile @@ -11,8 +11,10 @@ ENV DEBIAN_FRONTEND noninteractive RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip tzdata # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ diff --git a/build/package-test-dockerfiles/Makefile b/build/package-test-dockerfiles/Makefile index f2fd49b102..c6d5a15fba 100644 --- a/build/package-test-dockerfiles/Makefile +++ b/build/package-test-dockerfiles/Makefile @@ -28,12 +28,16 @@ ubuntu1804/generated: common-generated-all test -d ubuntu1804/generated || mkdir ubuntu1804/generated cp -rlt ubuntu1804/generated common-generated/* -RVMKEY=rvm.asc +RVMKEY1=mpapis.asc +RVMKEY2=pkuczynski.asc -common-generated-all: common-generated/$(RVMKEY) +common-generated-all: common-generated/$(RVMKEY1) common-generated/$(RVMKEY2) -common-generated/$(RVMKEY): common-generated - wget -cqO common-generated/$(RVMKEY) https://rvm.io/mpapis.asc +common-generated/$(RVMKEY1): common-generated + wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc + +common-generated/$(RVMKEY2): common-generated + wget -cqO common-generated/$(RVMKEY2) https://rvm.io/pkuczynski.asc common-generated: mkdir common-generated diff --git a/build/package-test-dockerfiles/centos7/Dockerfile b/build/package-test-dockerfiles/centos7/Dockerfile index 36be0ba32b..7a0cb9bd52 100644 --- a/build/package-test-dockerfiles/centos7/Dockerfile +++ b/build/package-test-dockerfiles/centos7/Dockerfile @@ -9,13 +9,16 @@ MAINTAINER Ward Vandewege RUN yum -q -y install scl-utils centos-release-scl which tar # Install RVM -ADD generated/rvm.asc /tmp/ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ RUN touch /var/lib/rpm/* && \ - gpg --import /tmp/rvm.asc && \ + gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ - /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \ - /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 + /usr/local/rvm/bin/rvm alias create default ruby-2.3 +# && \ +# /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 COPY localrepo.repo /etc/yum.repos.d/localrepo.repo diff --git a/build/package-test-dockerfiles/debian8/Dockerfile b/build/package-test-dockerfiles/debian8/Dockerfile index fdefadea50..2168f725a1 100644 --- a/build/package-test-dockerfiles/debian8/Dockerfile +++ b/build/package-test-dockerfiles/debian8/Dockerfile @@ -12,8 +12,10 @@ RUN apt-get update && \ apt-get -y install --no-install-recommends curl ca-certificates # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 diff --git a/build/package-test-dockerfiles/debian9/Dockerfile b/build/package-test-dockerfiles/debian9/Dockerfile index c682ccc7cb..9c46ef6013 100644 --- a/build/package-test-dockerfiles/debian9/Dockerfile +++ b/build/package-test-dockerfiles/debian9/Dockerfile @@ -12,8 +12,10 @@ RUN apt-get update && \ apt-get -y install --no-install-recommends curl ca-certificates gpg procps # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --no-tty --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 diff --git a/build/package-test-dockerfiles/ubuntu1404/Dockerfile b/build/package-test-dockerfiles/ubuntu1404/Dockerfile index 5f5b1d8819..c05dbee0f3 100644 --- a/build/package-test-dockerfiles/ubuntu1404/Dockerfile +++ b/build/package-test-dockerfiles/ubuntu1404/Dockerfile @@ -12,8 +12,10 @@ RUN apt-get update && \ apt-get -y install --no-install-recommends curl ca-certificates python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip binutils build-essential ca-certificates # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 diff --git a/build/package-test-dockerfiles/ubuntu1604/Dockerfile b/build/package-test-dockerfiles/ubuntu1604/Dockerfile index 1f65c7a474..615ab1c00e 100644 --- a/build/package-test-dockerfiles/ubuntu1604/Dockerfile +++ b/build/package-test-dockerfiles/ubuntu1604/Dockerfile @@ -12,8 +12,10 @@ RUN apt-get update && \ apt-get -y install --no-install-recommends curl ca-certificates # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 diff --git a/build/package-test-dockerfiles/ubuntu1804/Dockerfile b/build/package-test-dockerfiles/ubuntu1804/Dockerfile index 9d326c7294..d530d22a29 100644 --- a/build/package-test-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-test-dockerfiles/ubuntu1804/Dockerfile @@ -12,8 +12,10 @@ RUN apt-get update && \ apt-get -y install --no-install-recommends curl ca-certificates gnupg2 # Install RVM -ADD generated/rvm.asc /tmp/ -RUN gpg --import /tmp/rvm.asc && \ +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3