Skip to content

Commit cc40b6f

Browse files
committed
updated libgnutls because of gpg key errors in jenkins
Signed-off-by: pSchlarb <[email protected]>
1 parent b628b8d commit cc40b6f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

devops/ext/docker/base/xenial/Dockerfile.0.3.0

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2828
ruby-dev \
2929
rubygems \
3030
&& gem install --no-ri --no-rdoc fpm -v $FPM_VERSION \
31+
&& apt --only-upgrade install -y libgnutls30 \
3132
&& rm -rf /var/lib/apt/lists/*
3233

3334

@@ -38,7 +39,7 @@ RUN set -x \
3839
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
3940
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
4041
&& export GNUPGHOME="$(mktemp -d)" \
41-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
42+
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
4243
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
4344
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
4445
&& chmod +x /usr/local/bin/gosu \

devops/ext/docker/base/xenial/Dockerfile.0.8.0

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ RUN set -x \
4444
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
4545
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
4646
&& export GNUPGHOME="$(mktemp -d)" \
47-
&& (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
48-
|| gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
49-
|| gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
50-
|| gpg --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \
47+
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
5148
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
5249
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
5350
&& chmod +x /usr/local/bin/gosu \

0 commit comments

Comments
 (0)