From ceeec32c8ff4efefc8ed30b474edf96d4ebc1a38 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 23 Jan 2021 20:07:58 -0800 Subject: [PATCH] Some small fixes to composite image build --- docker/composite/Dockerfile | 2 ++ docker/composite/install.bash | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/composite/Dockerfile b/docker/composite/Dockerfile index 3e909d2..787dcca 100644 --- a/docker/composite/Dockerfile +++ b/docker/composite/Dockerfile @@ -14,3 +14,5 @@ RUN /tmp/install.bash 6 RUN /tmp/install.bash 7 RUN /tmp/install.bash 8 RUN /tmp/install.bash 9 + +RUN rm /tmp/install.bash diff --git a/docker/composite/install.bash b/docker/composite/install.bash index fae80fe..15b0ea6 100755 --- a/docker/composite/install.bash +++ b/docker/composite/install.bash @@ -10,7 +10,7 @@ function riju-curl { function riju-apt-install { riju-curl "$1" > "$(basename "$1")" - apt-get reinstall -y "./$(basename "$1")" + apt-get install -y "./$(basename "$1")" } pushd /tmp @@ -27,5 +27,3 @@ rm -rf *.deb rm -rf /var/lib/apt/lists/* popd - -rm "$0"