From 0bd67d48aebc43410c9a365b1f0b3ce8cd884475 Mon Sep 17 00:00:00 2001 From: Andrejus Kostarevas Date: Wed, 15 Apr 2020 14:16:27 +0100 Subject: [PATCH] remove apt dependency --- Dockerfile | 2 +- install.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 336ec53..506484b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ from ubuntu:bionic as install # Install sudo and make, git since built-in is skipped RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections RUN apt-get -qqy update \ - && apt-get -qqy install sudo git make + && apt-get -qqy install curl git make software-properties-common sudo # Create user with sudo priviledge ARG USER="test-user" diff --git a/install.sh b/install.sh index 9cf06f2..2d2bf81 100755 --- a/install.sh +++ b/install.sh @@ -23,7 +23,6 @@ fi touch "$install_lock_file" # Install all scripts by default - if [ -z "$TARGET" ]; then export TARGET="all" fi @@ -31,7 +30,7 @@ fi if [ "$TARGET" == "all" ]; then scripts=($install_dir/*.sh) else - scripts=($install_dir/*-{apt,bash,$TARGET}.sh) + scripts=($install_dir/*-{bash,$TARGET}.sh) fi for script in "${scripts[@]}"; do