From 2f44ad521485ed2699958c924e3dd7c0e4844788 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Mon, 20 Jul 2020 15:35:19 +0800 Subject: [PATCH] =?UTF-8?q?[fix:3.12]=E4=BF=AE=E6=94=B9Dockerfile=E4=B8=AD?= =?UTF-8?q?GOSU=E5=8F=98=E9=87=8F=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e9e369..e585151 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,6 @@ LABEL \ "Dockerfile"="https://github.com/colovu/docker-alpine" \ "Vendor"="Endial Fang (endial@126.com)" -ENV GOSU_VERSION=1.12 \ - GPG_KEYS="0xB42F6819007F00F88E364FD4036A9C25BF357DD4" - RUN set -eux; \ \ # 修改默认软件源为阿里云软件源 @@ -24,11 +21,13 @@ RUN set -eux; \ ; \ \ # 安装应用软件 + export GOSU_VERSION=1.12; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ \ # 安装软件包需要使用的GPG证书 + export GPG_KEYS="0xB42F6819007F00F88E364FD4036A9C25BF357DD4"; \ export GNUPGHOME="$(mktemp -d)"; \ for key in ${GPG_KEYS}; do \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${key}"|| \