Skip to content

Commit

Permalink
Add fallback keyservers to all apt-key commands.
Browse files Browse the repository at this point in the history 
This should prevent the reoccurring "no PGP data found" build error

Signed-off-by: Richard Berg <[email protected]>
  • Loading branch information
@rberg2
rberg2 committed Jun 27, 2018
1 parent d6ae9fb commit 10a04a5
Show file tree
Hide file tree
Showing 58 changed files with 270 additions and 135 deletions.
39 changes: 26 additions & 13 deletions ci/sawtooth-shell-installed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 8 additions & 4 deletions cli/Dockerfile-installed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion cli/tests/cli-tests.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion consensus/poet/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
21 changes: 14 additions & 7 deletions consensus/poet/cli/Dockerfile-installed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion consensus/poet/cli/tests/poet-cli-tests.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion consensus/poet/common/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 4 additions & 2 deletions consensus/poet/common/Dockerfile-installed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion consensus/poet/common/tests/poet-common-tests.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion consensus/poet/core/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading

0 comments on commit 10a04a5

Please sign in to comment.