summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-submodules17
-rwxr-xr-xscripts/docker-entrypoint.sh17
2 files changed, 16 insertions, 18 deletions
diff --git a/scripts/build-submodules b/scripts/build-submodules
index 86a7d8ae..bb5f55ce 100755
--- a/scripts/build-submodules
+++ b/scripts/build-submodules
@@ -160,6 +160,10 @@ for PKG in mdns-repeater \
vyos-world \
; do
build_package "$PKG"
+ ERRCODE=$?
+ if [ "$ERRCODE" -ne "0" ]; then
+ exit $ERRCODE
+ fi
done
@@ -192,6 +196,10 @@ build_kernel() {
status_ok
}
build_kernel
+ERRCODE=$?
+if [ "$ERRCODE" -ne "0" ]; then
+ exit $ERRCODE
+fi
# WIREGUARD
@@ -236,7 +244,10 @@ build_wireguard() {
status_ok
}
build_wireguard
-
+ERRCODE=$?
+if [ "$ERRCODE" -ne "0" ]; then
+ exit $ERRCODE
+fi
# ACCEL-PPP
build_accel-ppp() {
@@ -279,3 +290,7 @@ build_accel-ppp() {
status_ok
}
build_accel-ppp
+ERRCODE=$?
+if [ "$ERRCODE" -ne "0" ]; then
+ exit $ERRCODE
+fi
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
deleted file mode 100755
index 7520a8d9..00000000
--- a/scripts/docker-entrypoint.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Use GOSU_USER if its specified, else wirking dir user
-if [ -n "$GOSU_USER" ]; then
- ID=$GOSU_USER
-else
- ID=$(stat -c "%u:%g" .)
-fi
-
-# Don't use GOSU if we are root
-if [ ! "$ID" = "0:0" ]; then
- exec gosu $ID "$@"
-else
- exec "$@"
-fi