From 460ae8b48fe8fc2ad1585c4cb1629c9e77c6b1d5 Mon Sep 17 00:00:00 2001 From: Kreyren Date: Mon, 24 Feb 2020 04:56:46 +0000 Subject: [PATCH] sdghsdf --- .hadolint.yaml | 1 + gitpod/debian.Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.hadolint.yaml b/.hadolint.yaml index 90b65f9..35e92e0 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -2,6 +2,7 @@ ignored: - DL3007 # Usage of latest version is expected - DL3008 # Pinning specific version on apt is not sane - DL3015 # We don't mind recommended packages + - DL4001 # Allow usage of curl and wget - DL4006 # False-trigger on /bin/sh usage? trustedRegistries: diff --git a/gitpod/debian.Dockerfile b/gitpod/debian.Dockerfile index 07ab8e1..df8e266 100644 --- a/gitpod/debian.Dockerfile +++ b/gitpod/debian.Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update \ && apt-get install -y rustc cargo pkg-config \ && : "Install hadolint if not available in downstream" \ && if ! apt-cache search hadolint | grep -qP "^hadolint -.*"; then { if ! command -v wget >/dev/null; then apt-get install -y wget; fi ;} && wget https://github.com/hadolint/hadolint/releases/download/v1.17.5/hadolint-Linux-x86_64 -O /usr/bin/hadolint && { [ ! -x /usr/bin/hadolint ] && chmod +x /usr/bin/hadolint ;}; elif apt-cache search hadolint | grep -qP "^hadolint -.*"; then apt-get install -y hadolint; fi \ + && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/*