From 70c239f8d881d10ae544b62c7d81e95cf8ed9822 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 7 May 2020 17:46:19 +0100 Subject: [PATCH] Merge Seshat deps into a single apt-get --- dockerbuild/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 6ccfe3c..510363a 100644 --- a/dockerbuild/Dockerfile +++ b/dockerbuild/Dockerfile @@ -12,7 +12,9 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \ # libsecret-1-dev and libgnome-keyring-dev are required even for prebuild keytar apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl3 git git-lfs ssh unzip \ libsecret-1-dev libgnome-keyring-dev \ - libopenjp2-tools && \ + libopenjp2-tools \ + # Used by Seshat + libsqlcipher-dev && \ # git-lfs git lfs install && \ apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/* @@ -40,7 +42,4 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH -RUN apt-get update && \ - apt-get install -y libsqlcipher-dev && \ - rm -rf /var/lib/apt/lists/* && \ - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal