File tree Expand file tree Collapse file tree
devops/ext/docker/base/xenial Expand file tree Collapse file tree Original file line number Diff line number Diff 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 \
Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ RUN apt-add-repository ppa:brightbox/ruby-ng \
3232 autoconf \
3333 libtool \
3434 rpm \
35+ gnupg-curl \
3536 && gem install rake \
3637 && gem install --no-document fpm -v $FPM_VERSION \
3738 && rm -rf /var/lib/apt/lists/*
@@ -44,10 +45,7 @@ RUN set -x \
4445 && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
4546 && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
4647 && 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) \
48+ && gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
5149 && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
5250 && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
5351 && chmod +x /usr/local/bin/gosu \
You can’t perform that action at this time.
0 commit comments