From 53276e94fd652991de2dbfcbc9d0ae19f7145073 Mon Sep 17 00:00:00 2001 From: Lucas Briese Date: Mon, 8 Nov 2021 11:28:08 +0100 Subject: [PATCH] updated dependencies --- lgsm/Dockerfile | 6 +++--- test/testBuild.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/Dockerfile b/lgsm/Dockerfile index cd17247..3b4db9e 100644 --- a/lgsm/Dockerfile +++ b/lgsm/Dockerfile @@ -33,7 +33,7 @@ ENV STEAM_PATH="/home/steam" \ ENTRYPOINT ["./home/entrypoint.sh"] #WORKDIR "$STEAM_PATH" - + COPY ["entrypoint.sh", "initCron.sh", "createAlias.sh", "/home/"] # procps needed for ps command @@ -41,8 +41,8 @@ COPY ["entrypoint.sh", "initCron.sh", "createAlias.sh", "/home/"] RUN dpkg --add-architecture i386 && \ apt-get update -y && \ apt-get install -y mailutils postfix curl wget file tar bzip2 gzip unzip bsdmainutils python util-linux ca-certificates \ - binutils bc jq tmux lib32gcc1 libstdc++6 lib32stdc++6 libtinfo5:i386 netcat \ - procps iproute2 && \ + binutils bc jq tmux lib32gcc1 libstdc++6 lib32stdc++6 libtinfo5:i386 netcat libsdl2-2.0-0:i386 \ + procps iproute2 && \ \ groupadd -g $GROUP_ID $DOCKER_USER && \ useradd -d "$STEAM_PATH" -g $GROUP_ID -u $USER_ID -m $DOCKER_USER && \ diff --git a/test/testBuild.sh b/test/testBuild.sh index e813ebd..1e5b424 100644 --- a/test/testBuild.sh +++ b/test/testBuild.sh @@ -1,7 +1,7 @@ #!/bin/bash readonly SUFFIX="$1" -readonly SKIP_LGSM="$2" +readonly BUILD_LGSM="$(grep -qF '--skip-lgsm' <<< "$@" && echo false || echo true)" if [ "${DEBUGGING}" = "true" ]; then set -o xtrace @@ -15,7 +15,7 @@ set -o pipefail echo "[testBuild][INFO]build" -if [ "$SKIP_LGSM" = true ]; then +if "$BUILD_LGSM"; then docker rmi "jusito/docker-ttt:lgsm_debian${SUFFIX}" || true docker build --no-cache -t "jusito/docker-ttt:lgsm_debian${SUFFIX}" "lgsm/" fi @@ -26,5 +26,5 @@ docker build --no-cache -t "jusito/docker-ttt:gmod_debian${SUFFIX}" "gmod/" docker rmi "jusito/docker-ttt:gmod_ttt_debian${SUFFIX}" || true docker build --no-cache -t "jusito/docker-ttt:gmod_ttt_debian${SUFFIX}" "TTT/" -docker rmi "$DOCKER_REPO:latest${SUFFIX}" || true -docker tag "$DOCKER_REPO:gmod_ttt_debian${SUFFIX}" "$DOCKER_REPO:latest${SUFFIX}" \ No newline at end of file +docker rmi "jusito/docker-ttt:latest${SUFFIX}" || true +docker tag "jusito/docker-ttt:gmod_ttt_debian${SUFFIX}" "jusito/docker-ttt:latest${SUFFIX}"