From c9628e09c878e6e58f4bf53a310a0e05958bdb92 Mon Sep 17 00:00:00 2001 From: ThePhD Date: Fri, 29 Dec 2017 20:16:47 -0500 Subject: [PATCH] dockerfiles and attempts to get permissions to not be bodied --- Dockerfile | 4 ++-- scripts/preparation.linux.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index bafaeed5..d4c9b2b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,9 @@ WORKDIR / # start from the base after all run commands are executed RUN apt update RUN apt -y install sudo zsh +RUN apt -y dist-upgrade RUN mkdir -p build-sol2/Debug build-sol2/Release -RUN ls -lah -RUN ./sol2/scripts/preparation.linux.sh +RUN ["/usr/bin/env", "zsh", "-c", "./sol2/scripts/preparation.linux.sh"] # CMD/ENTRYPOINT is different from RUN # these are done on a per-instantiation and essentially describe # the DEFAULT behavior of this container when its started, not what state it diff --git a/scripts/preparation.linux.sh b/scripts/preparation.linux.sh index 5eea849a..f9e03015 100644 --- a/scripts/preparation.linux.sh +++ b/scripts/preparation.linux.sh @@ -23,8 +23,6 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # # Initial and necessary installations -sudo apt update -sudo apt -y dist-upgrade sudo apt -y install build-essential zsh ninja-build libreadline6 libreadline6-dev python3 zsh wget curl libcurl3 openssl libexpat1 libexpat1-dev cmake git # # CMake Installation (from script)