From f9aa8d4b8227bb2621fb51c50f0fcff3e6b1dff2 Mon Sep 17 00:00:00 2001 From: Ross MacArthur Date: Sun, 12 Apr 2020 20:56:14 +0200 Subject: [PATCH] Remove gnupg and Git installs --- docker/Dockerfile | 10 ---------- docker/install_git.sh | 19 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 docker/install_git.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 9724f43..5202f22 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,5 @@ FROM rustembedded/cross:{{target}} -{{#if is_musl ~}} -RUN apt-get update \ - && apt-get install -y --no-install-recommends gnupg \ - && rm -rf /var/lib/apt/lists/* - -{{/if~}} - -COPY install_git.sh / -RUN bash /install_git.sh - COPY install_openssl.sh / RUN bash /install_openssl.sh {{install_openssl_args}} diff --git a/docker/install_git.sh b/docker/install_git.sh deleted file mode 100644 index bc3d99c..0000000 --- a/docker/install_git.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Install the latest stable git. - -set -euxo pipefail - -main() { - echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu trusty main" \ - > /etc/apt/sources.list.d/git-core.list - apt-key adv --keyserver keyserver.ubuntu.com --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 - apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/git-core.list" \ - -o Dir::Etc::sourceparts="-" \ - -o APT::Get::List-Cleanup="0" - apt-get -y --no-install-recommends install git --upgrade - rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/git-core.list -} - -main