From 1589f5088209ab2a8775666d092efeea3ef2e12f Mon Sep 17 00:00:00 2001 From: Myve Date: Fri, 19 Jul 2024 06:36:07 +0000 Subject: [PATCH] Update 01-init --- base/app/entrypoint | 9 --------- base/app/init.d/01-init.sh | 2 +- base/app/init.d/10-nginx.sh | 2 +- base/build | 4 ++-- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/base/app/entrypoint b/base/app/entrypoint index e489770..a316cd9 100755 --- a/base/app/entrypoint +++ b/base/app/entrypoint @@ -5,20 +5,11 @@ set -a # Abort if an error is encountered set -e -# SSH config -if [ -f ~/.ssh/id_ed25519 ] -then - chmod 0600 ~/.ssh/id_ed25519 -fi - # Run all scripts in init folder for file in /app/init.d/*.sh do /bin/bash -c ${file} >>/app/logs/$(echo ${file} | sed 's|/app/init.d/||;s|\.sh$||').log done -# Read cli parameters -exec "${@}" & - # Monitor log tail -f /app/logs/*.log diff --git a/base/app/init.d/01-init.sh b/base/app/init.d/01-init.sh index 18f3be1..3a0303b 100755 --- a/base/app/init.d/01-init.sh +++ b/base/app/init.d/01-init.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Create base directories for dir in vnc config ssh do @@ -6,4 +7,3 @@ do done ## OPTIONAL: More commands may be added below - diff --git a/base/app/init.d/10-nginx.sh b/base/app/init.d/10-nginx.sh index 17493bd..4f5f121 100755 --- a/base/app/init.d/10-nginx.sh +++ b/base/app/init.d/10-nginx.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Reformat path +# Reformat proxy path if [[ ${MYVNC_PROXYPATH} == "/" ]] then unset _MYVNC_PROXYPATH diff --git a/base/build b/base/build index 9984092..ca1018f 100755 --- a/base/build +++ b/base/build @@ -3,6 +3,6 @@ # Optional buildtag, addpkg # addpkg=openssh \ DOCKER_BUILDKIT=1 \ -docker build ./. \ +docker build . \ --build-arg addpkg=${addpkg:-""} \ - --tag ${buildtag:-alpine/base} \ No newline at end of file + --tag ${buildtag:-alpine/base}