Merge pull request #14982 from carlocab/docker

Dockerfile: fix installation of `gh`, et al.
This commit is contained in:
Carlo Cabrera 2023-03-16 01:37:00 +08:00 committed by GitHub
commit 279217cd14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,7 +9,8 @@ ARG DEBIAN_FRONTEND=noninteractive
# hadolint ignore=DL3008 # hadolint ignore=DL3008
# /etc/lsb-release is checked inside the container and sets DISTRIB_RELEASE. # /etc/lsb-release is checked inside the container and sets DISTRIB_RELEASE.
# shellcheck disable=SC1091,SC2154 # We need `[` instead of `[[` because the shell is `/bin/sh`.
# shellcheck disable=SC1091,SC2154,SC2292
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends software-properties-common gnupg-agent \ && apt-get install -y --no-install-recommends software-properties-common gnupg-agent \
&& add-apt-repository -y ppa:git-core/ppa \ && add-apt-repository -y ppa:git-core/ppa \
@ -36,7 +37,7 @@ RUN apt-get update \
uuid-runtime \ uuid-runtime \
tzdata \ tzdata \
jq \ jq \
&& if [[ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -ge 18 ]]; then apt-get install gh gpg skopeo; fi \ && if [ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -ge 18 ]; then apt-get install -y --no-install-recommends gh gpg skopeo; fi \
&& apt-get remove --purge -y software-properties-common \ && apt-get remove --purge -y software-properties-common \
&& apt-get autoremove --purge -y \ && apt-get autoremove --purge -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \