From 10a04a56ae29b5e4b38127399dc01552db500c0a Mon Sep 17 00:00:00 2001 From: Richard Berg Date: Mon, 25 Jun 2018 11:30:45 -0500 Subject: [PATCH] Add fallback keyservers to all apt-key commands. This should prevent the reoccurring "no PGP data found" build error Signed-off-by: Richard Berg --- ci/sawtooth-shell-installed | 39 ++++++++++++------- cli/Dockerfile | 3 +- cli/Dockerfile-installed | 12 ++++-- cli/tests/cli-tests.dockerfile | 3 +- consensus/poet/cli/Dockerfile | 3 +- consensus/poet/cli/Dockerfile-installed | 21 ++++++---- .../poet/cli/tests/poet-cli-tests.dockerfile | 3 +- consensus/poet/common/Dockerfile | 3 +- consensus/poet/common/Dockerfile-installed | 6 ++- .../common/tests/poet-common-tests.dockerfile | 3 +- consensus/poet/core/Dockerfile | 3 +- consensus/poet/core/Dockerfile-installed | 18 ++++++--- .../core/tests/poet-core-tests.dockerfile | 3 +- consensus/poet/families/Dockerfile | 3 +- consensus/poet/families/Dockerfile-installed | 15 ++++--- .../tp-validator-registry-tests.dockerfile | 3 +- consensus/poet/sgx/Dockerfile-installed | 12 ++++-- consensus/poet/simulator/Dockerfile | 3 +- consensus/poet/simulator/Dockerfile-installed | 15 ++++--- .../tests/poet-simulator-tests.dockerfile | 3 +- docker/sawtooth-shell | 3 +- families/battleship/Dockerfile | 3 +- .../tests/battleship-tests.dockerfile | 3 +- families/block_info/Dockerfile | 3 +- families/block_info/Dockerfile-installed | 12 ++++-- .../tests/block-info-tests.dockerfile | 3 +- families/identity/Dockerfile | 3 +- families/identity/Dockerfile-installed | 12 ++++-- .../identity/tests/identity-tests.dockerfile | 3 +- families/settings/Dockerfile | 3 +- families/settings/Dockerfile-installed | 12 ++++-- families/settings/tests/settings.dockerfile | 3 +- .../smallbank_go/Dockerfile-installed | 3 +- integration/Dockerfile-installed | 6 ++- rest_api/Dockerfile | 3 +- rest_api/Dockerfile-installed | 12 ++++-- rest_api/tests/rest-api-tests.dockerfile | 3 +- sdk/examples/intkey_go/Dockerfile-installed | 3 +- sdk/examples/intkey_python/Dockerfile | 3 +- .../intkey_python/Dockerfile-installed | 12 ++++-- .../intkey_python/Dockerfile-tests-installed | 12 ++++-- sdk/examples/noop_go/Dockerfile-installed | 3 +- sdk/examples/xo_go/Dockerfile-installed | 3 +- sdk/examples/xo_python/Dockerfile | 3 +- sdk/examples/xo_python/Dockerfile-installed | 12 ++++-- .../xo_python/Dockerfile-tests-installed | 12 ++++-- sdk/python/Dockerfile | 3 +- sdk/python/Dockerfile-installed | 9 +++-- sdk/python/tests/python-sdk-tests.dockerfile | 3 +- signing/Dockerfile | 3 +- signing/Dockerfile-installed | 3 +- signing/tests/signing-tests.dockerfile | 3 +- utility/ias_client/Dockerfile-installed | 6 ++- .../tests/ias-client-tests.dockerfile | 3 +- utility/ias_proxy/Dockerfile-installed | 15 ++++--- validator/Dockerfile | 3 +- validator/Dockerfile-installed | 24 ++++++++---- validator/tests/validator-tests.dockerfile | 3 +- 58 files changed, 270 insertions(+), 135 deletions(-) diff --git a/ci/sawtooth-shell-installed b/ci/sawtooth-shell-installed index de3f97e302..b4e9aae0e0 100644 --- a/ci/sawtooth-shell-installed +++ b/ci/sawtooth-shell-installed @@ -21,7 +21,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -50,7 +51,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -85,7 +87,8 @@ FROM ubuntu:xenial as python-xo-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -120,7 +123,8 @@ FROM ubuntu:xenial as sawtooth-settings-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -154,7 +158,8 @@ FROM ubuntu:xenial as python-intkey-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -188,7 +193,8 @@ FROM ubuntu:xenial as sawtooth-validator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -245,7 +251,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -272,7 +279,8 @@ FROM ubuntu:xenial as sawtooth-simulator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3-cryptography>-1.7.1 \ @@ -308,7 +316,8 @@ FROM ubuntu:xenial as poet-core-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -344,7 +353,8 @@ FROM ubuntu:xenial as poet-cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -381,7 +391,8 @@ FROM ubuntu:xenial as cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -397,7 +408,8 @@ COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp COPY . /project RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install @@ -426,7 +438,8 @@ COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intk COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -q -y curl \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ diff --git a/cli/Dockerfile b/cli/Dockerfile index 8e9656a80e..56458b7016 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -21,7 +21,8 @@ FROM ubuntu:xenial ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/cli/Dockerfile-installed b/cli/Dockerfile-installed index d073defe8e..95065dacb0 100644 --- a/cli/Dockerfile-installed +++ b/cli/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -64,7 +66,8 @@ COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp COPY . /project RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install @@ -85,7 +88,8 @@ COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp COPY --from=cli-builder /project/python3-sawtooth-cli*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth*.deb || true \ && apt-get -f -y install \ diff --git a/cli/tests/cli-tests.dockerfile b/cli/tests/cli-tests.dockerfile index fea8854435..d350f4e0b8 100644 --- a/cli/tests/cli-tests.dockerfile +++ b/cli/tests/cli-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/consensus/poet/cli/Dockerfile b/consensus/poet/cli/Dockerfile index dfb5355e78..ae8865992b 100644 --- a/consensus/poet/cli/Dockerfile +++ b/consensus/poet/cli/Dockerfile @@ -21,7 +21,8 @@ FROM ubuntu:xenial as poet-cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/consensus/poet/cli/Dockerfile-installed b/consensus/poet/cli/Dockerfile-installed index 3113a48fcc..83ca3922f5 100644 --- a/consensus/poet/cli/Dockerfile-installed +++ b/consensus/poet/cli/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-validator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -105,7 +107,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -132,7 +135,8 @@ FROM ubuntu:xenial as sawtooth-simulator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3-cryptography>-1.7.1 \ @@ -168,7 +172,8 @@ FROM ubuntu:xenial as poet-core-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -204,7 +209,8 @@ FROM ubuntu:xenial as poet-cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -246,7 +252,8 @@ COPY --from=poet-core-builder /project/consensus/poet/python3-sawtooth-poet-core COPY --from=poet-cli-builder /project/consensus/poet/python3-sawtooth-poet-cli*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/cli/tests/poet-cli-tests.dockerfile b/consensus/poet/cli/tests/poet-cli-tests.dockerfile index 86ddc21f53..2fab4fe5cb 100644 --- a/consensus/poet/cli/tests/poet-cli-tests.dockerfile +++ b/consensus/poet/cli/tests/poet-cli-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/consensus/poet/common/Dockerfile b/consensus/poet/common/Dockerfile index 9c92997a44..5356c0d099 100644 --- a/consensus/poet/common/Dockerfile +++ b/consensus/poet/common/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/consensus/poet/common/Dockerfile-installed b/consensus/poet/common/Dockerfile-installed index 2f27d32803..0ff147e8f9 100644 --- a/consensus/poet/common/Dockerfile-installed +++ b/consensus/poet/common/Dockerfile-installed @@ -21,7 +21,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -47,7 +48,8 @@ FROM ubuntu:xenial COPY --from=poet-common-builder /project/consensus/poet/python3-sawtooth-poet-common*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/common/tests/poet-common-tests.dockerfile b/consensus/poet/common/tests/poet-common-tests.dockerfile index 2dee1bec5e..d5f6a8ad5b 100644 --- a/consensus/poet/common/tests/poet-common-tests.dockerfile +++ b/consensus/poet/common/tests/poet-common-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/consensus/poet/core/Dockerfile b/consensus/poet/core/Dockerfile index 77418addf7..da583e0d50 100644 --- a/consensus/poet/core/Dockerfile +++ b/consensus/poet/core/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/consensus/poet/core/Dockerfile-installed b/consensus/poet/core/Dockerfile-installed index 86b7c5b88d..0af05385e1 100644 --- a/consensus/poet/core/Dockerfile-installed +++ b/consensus/poet/core/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-validator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -105,7 +107,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -132,7 +135,8 @@ FROM ubuntu:xenial as sawtooth-simulator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3-cryptography>-1.7.1 \ @@ -168,7 +172,8 @@ FROM ubuntu:xenial as poet-core-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -207,7 +212,8 @@ COPY --from=sawtooth-simulator-builder /project/consensus/poet/python3-sawtooth- COPY --from=poet-core-builder /project/consensus/poet/python3-sawtooth-poet-core*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/core/tests/poet-core-tests.dockerfile b/consensus/poet/core/tests/poet-core-tests.dockerfile index 5cf3913337..2862ec2fd7 100644 --- a/consensus/poet/core/tests/poet-core-tests.dockerfile +++ b/consensus/poet/core/tests/poet-core-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/consensus/poet/families/Dockerfile b/consensus/poet/families/Dockerfile index 44f6af6557..af132a10db 100644 --- a/consensus/poet/families/Dockerfile +++ b/consensus/poet/families/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/consensus/poet/families/Dockerfile-installed b/consensus/poet/families/Dockerfile-installed index c0d244e8c8..4a34c783a5 100644 --- a/consensus/poet/families/Dockerfile-installed +++ b/consensus/poet/families/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -109,7 +112,8 @@ FROM ubuntu:xenial as poet-families-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -140,7 +144,8 @@ COPY --from=poet-common-builder /project/consensus/poet/python3-sawtooth-poet-co COPY --from=poet-families-builder /project/consensus/poet/python3-sawtooth-poet-families*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/families/tests/tp-validator-registry-tests.dockerfile b/consensus/poet/families/tests/tp-validator-registry-tests.dockerfile index ae9d092cd6..e27601fe5b 100644 --- a/consensus/poet/families/tests/tp-validator-registry-tests.dockerfile +++ b/consensus/poet/families/tests/tp-validator-registry-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/consensus/poet/sgx/Dockerfile-installed b/consensus/poet/sgx/Dockerfile-installed index b86b5b4d3f..6d746da34b 100644 --- a/consensus/poet/sgx/Dockerfile-installed +++ b/consensus/poet/sgx/Dockerfile-installed @@ -21,7 +21,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as ias-client-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -73,7 +75,8 @@ FROM ubuntu:xenial as poet-sgx-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ build-essential \ @@ -137,7 +140,8 @@ COPY --from=ias-client-builder /project/utility/python3-sawtooth-ias-client*.deb COPY --from=poet-sgx-builder /project/consensus/poet/python3-sawtooth-poet-sgx*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/simulator/Dockerfile b/consensus/poet/simulator/Dockerfile index 99d14d44a7..614ff27831 100644 --- a/consensus/poet/simulator/Dockerfile +++ b/consensus/poet/simulator/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/consensus/poet/simulator/Dockerfile-installed b/consensus/poet/simulator/Dockerfile-installed index f97da23319..b3c5b4affe 100644 --- a/consensus/poet/simulator/Dockerfile-installed +++ b/consensus/poet/simulator/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-validator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -105,7 +107,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -132,7 +135,8 @@ FROM ubuntu:xenial as sawtooth-simulator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3-cryptography>-1.7.1 \ @@ -170,7 +174,8 @@ COPY --from=sawtooth-validator-builder /project/python3-sawtooth-validator*.deb COPY --from=sawtooth-simulator-builder /project/consensus/poet/python3-sawtooth-poet-simulator*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth*.deb || true \ && apt-get -f -y install \ diff --git a/consensus/poet/simulator/tests/poet-simulator-tests.dockerfile b/consensus/poet/simulator/tests/poet-simulator-tests.dockerfile index 5a4c053187..21bfcb43d7 100644 --- a/consensus/poet/simulator/tests/poet-simulator-tests.dockerfile +++ b/consensus/poet/simulator/tests/poet-simulator-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/docker/sawtooth-shell b/docker/sawtooth-shell index 9d7982e54b..6629410bbe 100644 --- a/docker/sawtooth-shell +++ b/docker/sawtooth-shell @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/families/battleship/Dockerfile b/families/battleship/Dockerfile index 17ab3d7370..7e7bf2fc34 100644 --- a/families/battleship/Dockerfile +++ b/families/battleship/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/families/battleship/tests/battleship-tests.dockerfile b/families/battleship/tests/battleship-tests.dockerfile index a0e1b99f13..e16f245713 100644 --- a/families/battleship/tests/battleship-tests.dockerfile +++ b/families/battleship/tests/battleship-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/families/block_info/Dockerfile b/families/block_info/Dockerfile index 1c24fb8934..c41cd7d2b0 100644 --- a/families/block_info/Dockerfile +++ b/families/block_info/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/families/block_info/Dockerfile-installed b/families/block_info/Dockerfile-installed index 4e7e79c059..011ceddc0f 100644 --- a/families/block_info/Dockerfile-installed +++ b/families/block_info/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as block-info-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -115,7 +118,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=block-info-tp-builder /project/families/python3-sawtooth-block-info*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/families/block_info/tests/block-info-tests.dockerfile b/families/block_info/tests/block-info-tests.dockerfile index fe287fd0b9..b3f05e53f3 100644 --- a/families/block_info/tests/block-info-tests.dockerfile +++ b/families/block_info/tests/block-info-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/families/identity/Dockerfile b/families/identity/Dockerfile index 02a388d620..34f70a5d64 100644 --- a/families/identity/Dockerfile +++ b/families/identity/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/families/identity/Dockerfile-installed b/families/identity/Dockerfile-installed index 6ea44de6bd..f7d4a3b18c 100644 --- a/families/identity/Dockerfile-installed +++ b/families/identity/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as identity-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -115,7 +118,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=identity-tp-builder /project/families/python3-sawtooth-identity*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/families/identity/tests/identity-tests.dockerfile b/families/identity/tests/identity-tests.dockerfile index a0e1b99f13..e16f245713 100644 --- a/families/identity/tests/identity-tests.dockerfile +++ b/families/identity/tests/identity-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/families/settings/Dockerfile b/families/settings/Dockerfile index 9fc6fd16af..70002aee97 100644 --- a/families/settings/Dockerfile +++ b/families/settings/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/families/settings/Dockerfile-installed b/families/settings/Dockerfile-installed index 79de702523..087ef41f0c 100644 --- a/families/settings/Dockerfile-installed +++ b/families/settings/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -83,7 +85,8 @@ FROM ubuntu:xenial as sawtooth-settings-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -119,7 +122,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=sawtooth-settings-builder /project/families/python3-sawtooth-settings*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/families/settings/tests/settings.dockerfile b/families/settings/tests/settings.dockerfile index 08c2c6fe9b..44ec81dcd1 100644 --- a/families/settings/tests/settings.dockerfile +++ b/families/settings/tests/settings.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/families/smallbank/smallbank_go/Dockerfile-installed b/families/smallbank/smallbank_go/Dockerfile-installed index 14e36f2401..e5a068f73e 100644 --- a/families/smallbank/smallbank_go/Dockerfile-installed +++ b/families/smallbank/smallbank_go/Dockerfile-installed @@ -22,7 +22,8 @@ ENV VERSION=AUTO_STRICT RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu xenial-backports universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ build-essential \ diff --git a/integration/Dockerfile-installed b/integration/Dockerfile-installed index 10f9d7a3b1..b19a42547f 100644 --- a/integration/Dockerfile-installed +++ b/integration/Dockerfile-installed @@ -21,7 +21,8 @@ FROM ubuntu:xenial as sawtooth-integration-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -43,7 +44,8 @@ FROM ubuntu:xenial COPY --from=sawtooth-integration-builder /project/python3-sawtooth-integration*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/rest_api/Dockerfile b/rest_api/Dockerfile index 8527c65bc2..86a978f859 100644 --- a/rest_api/Dockerfile +++ b/rest_api/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/rest_api/Dockerfile-installed b/rest_api/Dockerfile-installed index 1804713858..7b83face16 100644 --- a/rest_api/Dockerfile-installed +++ b/rest_api/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as rest-api-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -118,7 +121,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=rest-api-builder /project/python3-sawtooth-rest-api*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/rest_api/tests/rest-api-tests.dockerfile b/rest_api/tests/rest-api-tests.dockerfile index 9fc8ae1a94..587275d55d 100644 --- a/rest_api/tests/rest-api-tests.dockerfile +++ b/rest_api/tests/rest-api-tests.dockerfile @@ -13,7 +13,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/sdk/examples/intkey_go/Dockerfile-installed b/sdk/examples/intkey_go/Dockerfile-installed index 2c5cac99f0..91462aeb60 100644 --- a/sdk/examples/intkey_go/Dockerfile-installed +++ b/sdk/examples/intkey_go/Dockerfile-installed @@ -22,7 +22,8 @@ ENV VERSION=AUTO_STRICT RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu xenial-backports universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ build-essential \ diff --git a/sdk/examples/intkey_python/Dockerfile b/sdk/examples/intkey_python/Dockerfile index 449efbf446..1359504b92 100644 --- a/sdk/examples/intkey_python/Dockerfile +++ b/sdk/examples/intkey_python/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/sdk/examples/intkey_python/Dockerfile-installed b/sdk/examples/intkey_python/Dockerfile-installed index ce3d441272..1ab009a2b1 100644 --- a/sdk/examples/intkey_python/Dockerfile-installed +++ b/sdk/examples/intkey_python/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -49,7 +50,8 @@ ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -83,7 +85,8 @@ FROM ubuntu:xenial as python-intkey-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -119,7 +122,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/sdk/examples/intkey_python/Dockerfile-tests-installed b/sdk/examples/intkey_python/Dockerfile-tests-installed index fba5bdf527..3186a87060 100644 --- a/sdk/examples/intkey_python/Dockerfile-tests-installed +++ b/sdk/examples/intkey_python/Dockerfile-tests-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as python-intkey-tests-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -120,7 +123,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=python-intkey-tests-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/sdk/examples/noop_go/Dockerfile-installed b/sdk/examples/noop_go/Dockerfile-installed index d4f5e15eae..2f9c5e495f 100644 --- a/sdk/examples/noop_go/Dockerfile-installed +++ b/sdk/examples/noop_go/Dockerfile-installed @@ -22,7 +22,8 @@ ENV VERSION=AUTO_STRICT RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu xenial-backports universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ build-essential \ diff --git a/sdk/examples/xo_go/Dockerfile-installed b/sdk/examples/xo_go/Dockerfile-installed index 8fb6e74115..0ad7edd2ee 100644 --- a/sdk/examples/xo_go/Dockerfile-installed +++ b/sdk/examples/xo_go/Dockerfile-installed @@ -22,7 +22,8 @@ ENV VERSION=AUTO_STRICT RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu xenial-backports universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ build-essential \ diff --git a/sdk/examples/xo_python/Dockerfile b/sdk/examples/xo_python/Dockerfile index 94b10b1618..a04a4aaec1 100644 --- a/sdk/examples/xo_python/Dockerfile +++ b/sdk/examples/xo_python/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/sdk/examples/xo_python/Dockerfile-installed b/sdk/examples/xo_python/Dockerfile-installed index d99e5ecb41..1110536b5b 100644 --- a/sdk/examples/xo_python/Dockerfile-installed +++ b/sdk/examples/xo_python/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as python-xo-tp-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -118,7 +121,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/sdk/examples/xo_python/Dockerfile-tests-installed b/sdk/examples/xo_python/Dockerfile-tests-installed index 5e833c8af4..deabd2330e 100644 --- a/sdk/examples/xo_python/Dockerfile-tests-installed +++ b/sdk/examples/xo_python/Dockerfile-tests-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as python-xo-tests-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -120,7 +123,8 @@ COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb / COPY --from=python-xo-tests-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/sdk/python/Dockerfile b/sdk/python/Dockerfile index cb0b4ad41a..15c08953e3 100644 --- a/sdk/python/Dockerfile +++ b/sdk/python/Dockerfile @@ -21,7 +21,8 @@ FROM ubuntu:xenial ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/sdk/python/Dockerfile-installed b/sdk/python/Dockerfile-installed index 4c4fcf7e93..fcf67765be 100644 --- a/sdk/python/Dockerfile-installed +++ b/sdk/python/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -84,7 +86,8 @@ COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth*.deb || true \ && apt-get -f -y install \ diff --git a/sdk/python/tests/python-sdk-tests.dockerfile b/sdk/python/tests/python-sdk-tests.dockerfile index 2fa9671d26..e4373f53c0 100644 --- a/sdk/python/tests/python-sdk-tests.dockerfile +++ b/sdk/python/tests/python-sdk-tests.dockerfile @@ -16,7 +16,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/signing/Dockerfile b/signing/Dockerfile index c56019c54a..7cd16d38d8 100644 --- a/signing/Dockerfile +++ b/signing/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/signing/Dockerfile-installed b/signing/Dockerfile-installed index 1ae3386468..619168b73a 100644 --- a/signing/Dockerfile-installed +++ b/signing/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/signing/tests/signing-tests.dockerfile b/signing/tests/signing-tests.dockerfile index 71e0dedeec..abaa3d2464 100644 --- a/signing/tests/signing-tests.dockerfile +++ b/signing/tests/signing-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ diff --git a/utility/ias_client/Dockerfile-installed b/utility/ias_client/Dockerfile-installed index f846cae112..1e168dfbef 100644 --- a/utility/ias_client/Dockerfile-installed +++ b/utility/ias_client/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as ias-client-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -43,7 +44,8 @@ FROM ubuntu:xenial COPY --from=ias-client-builder /project/utility/python3-sawtooth-ias-client*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/utility/ias_client/tests/ias-client-tests.dockerfile b/utility/ias_client/tests/ias-client-tests.dockerfile index e3692b69c3..ab409cee7b 100644 --- a/utility/ias_client/tests/ias-client-tests.dockerfile +++ b/utility/ias_client/tests/ias-client-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3 diff --git a/utility/ias_proxy/Dockerfile-installed b/utility/ias_proxy/Dockerfile-installed index 601cd980d7..d0bafd38cf 100644 --- a/utility/ias_proxy/Dockerfile-installed +++ b/utility/ias_proxy/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -48,7 +49,8 @@ FROM ubuntu:xenial as sawtooth-sdk-python-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -82,7 +84,8 @@ FROM ubuntu:xenial as ias-client-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -106,7 +109,8 @@ FROM ubuntu:xenial as ias-proxy-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -134,7 +138,8 @@ COPY --from=ias-client-builder /project/utility/python3-sawtooth-ias-client*.deb COPY --from=ias-proxy-builder /project/utility/python3-sawtooth-ias-proxy*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install \ diff --git a/validator/Dockerfile b/validator/Dockerfile index 115f48a993..e0b3b77e6d 100644 --- a/validator/Dockerfile +++ b/validator/Dockerfile @@ -19,7 +19,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \ diff --git a/validator/Dockerfile-installed b/validator/Dockerfile-installed index e3fe4c5764..a493b58a50 100644 --- a/validator/Dockerfile-installed +++ b/validator/Dockerfile-installed @@ -20,7 +20,8 @@ FROM ubuntu:xenial as sawtooth-signing-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -47,7 +48,8 @@ FROM ubuntu:xenial as sawtooth-validator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -103,7 +105,8 @@ FROM ubuntu:xenial as sawtooth-cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -135,7 +138,8 @@ FROM ubuntu:xenial as poet-common-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -162,7 +166,8 @@ FROM ubuntu:xenial as sawtooth-simulator-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ python3-cryptography>=1.7.1 \ @@ -198,7 +203,8 @@ FROM ubuntu:xenial as poet-core-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -234,7 +240,8 @@ FROM ubuntu:xenial as poet-cli-builder ENV VERSION=AUTO_STRICT RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ git \ @@ -278,7 +285,8 @@ COPY --from=poet-cli-builder /project/consensus/poet/python3-sawtooth-poet-cli*. COPY --from=sawtooth-validator-builder /project/python3-sawtooth-validator*.deb /tmp RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && dpkg -i /tmp/python3-sawtooth-*.deb || true \ && apt-get -f -y install diff --git a/validator/tests/validator-tests.dockerfile b/validator/tests/validator-tests.dockerfile index 04313ab9d2..4440f81d97 100644 --- a/validator/tests/validator-tests.dockerfile +++ b/validator/tests/validator-tests.dockerfile @@ -15,7 +15,8 @@ FROM ubuntu:xenial RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update RUN apt-get install -y -q --allow-downgrades \