diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fcec904..1577a99 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,4 +11,4 @@ jobs: - name: Run ShellCheck uses: ludeeus/action-shellcheck@master env: - SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153 -e SC2004 + SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153 -e SC2004 diff --git a/Dockerfile b/Dockerfile index fb786c6..92ffaa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,8 @@ RUN apt-get update && apt-get -y upgrade && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -COPY run/*.sh /run/ +COPY src/*.sh /run/ COPY --from=builder /qemu-host.bin /run/host.bin - RUN chmod +x /run/*.sh && chmod +x /run/*.bin VOLUME /storage @@ -66,4 +65,4 @@ LABEL org.opencontainers.image.description="Virtual DSM in a docker container" HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh -ENTRYPOINT ["/usr/bin/tini", "-s", "/run/run.sh"] +ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"] diff --git a/run/check.sh b/src/check.sh similarity index 100% rename from run/check.sh rename to src/check.sh diff --git a/run/config.sh b/src/config.sh similarity index 100% rename from run/config.sh rename to src/config.sh diff --git a/run/disk.sh b/src/disk.sh similarity index 100% rename from run/disk.sh rename to src/disk.sh diff --git a/run/run.sh b/src/entry.sh similarity index 55% rename from run/run.sh rename to src/entry.sh index fbb19a7..9039da0 100755 --- a/run/run.sh +++ b/src/entry.sh @@ -4,14 +4,16 @@ set -Eeuo pipefail echo "❯ Starting Virtual DSM for Docker v${VERSION}..." echo "❯ For support visit https://github.com/vdsm/virtual-dsm/" -. /run/reset.sh # Initialize system -. /run/install.sh # Run installation -. /run/disk.sh # Initialize disks -. /run/network.sh # Initialize network -. /run/gpu.sh # Initialize graphics -. /run/serial.sh # Initialize serialport -. /run/power.sh # Configure shutdown -. /run/config.sh # Configure arguments +cd /run + +. reset.sh # Initialize system +. install.sh # Run installation +. disk.sh # Initialize disks +. network.sh # Initialize network +. gpu.sh # Initialize graphics +. serial.sh # Initialize serialport +. power.sh # Configure shutdown +. config.sh # Configure arguments trap - ERR diff --git a/run/gpu.sh b/src/gpu.sh similarity index 100% rename from run/gpu.sh rename to src/gpu.sh diff --git a/run/install.sh b/src/install.sh similarity index 100% rename from run/install.sh rename to src/install.sh diff --git a/run/network.sh b/src/network.sh similarity index 100% rename from run/network.sh rename to src/network.sh diff --git a/run/power.sh b/src/power.sh similarity index 100% rename from run/power.sh rename to src/power.sh diff --git a/run/print.sh b/src/print.sh similarity index 100% rename from run/print.sh rename to src/print.sh diff --git a/run/reset.sh b/src/reset.sh similarity index 91% rename from run/reset.sh rename to src/reset.sh index f7c2543..31d4678 100644 --- a/run/reset.sh +++ b/src/reset.sh @@ -5,7 +5,7 @@ info () { echo -e "\E[1;34m❯ \E[1;36m$1\E[0m" ; } error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; } trap 'error "Status $? while: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' ERR -[ ! -f "/run/run.sh" ] && error "Script must run inside Docker container!" && exit 11 +[ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11 [ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12 # Docker environment variables diff --git a/run/serial.sh b/src/serial.sh similarity index 100% rename from run/serial.sh rename to src/serial.sh diff --git a/run/server.sh b/src/server.sh similarity index 100% rename from run/server.sh rename to src/server.sh