refactor: change extra scripts, and scripts

Author: iPromKnight

apps/alpine/Dockerfile

@@ -70,10 +70,10 @@ RUN \
     && rm -rf /tmp/*
 
 VOLUME ["/config"]
-RUN mkdir -p /extra-scripts \
-    && chown -R notroot:notroot /extra-scripts \
-    && chmod -R 775 /extra-scripts
-COPY ./apps/alpine/scripts /scripts
+RUN mkdir -p /extra_scripts \
+    && chown -R notroot:notroot /extra_scripts \
+    && chmod -R 775 /extra_scripts
+COPY ./apps/alpine/scripts /prom_scripts
 COPY --chmod=0755 apps/alpine/base-entrypoint.sh /base-entrypoint.sh
 COPY --chmod=0755 apps/alpine/promknight-entrypoint.sh /promknight-entrypoint.sh
 COPY --from=builder /go/bin/envsubst /usr/local/bin/envsubst

apps/alpine/base-entrypoint.sh

@@ -4,10 +4,10 @@ set -e
 
 echo "Based on work by funky penguin @elfhosted/containers"
 
-source "/scripts/wait-for-vpn.sh"
-source "/scripts/wait-for-urls.sh"
-source "/scripts/wait-for-mounts.sh"
-source "/scripts/umask.sh"
-source "/scripts/extra-scripts.sh"
+source "/prom_scripts/wait-for-vpn.sh"
+source "/prom_scripts/wait-for-urls.sh"
+source "/prom_scripts/wait-for-mounts.sh"
+source "/prom_scripts/umask.sh"
+source "/prom_scripts/extra-scripts.sh"
 
 exec /promknight-entrypoint.sh

apps/alpine/scripts/extra-scripts.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Execute any scripts found in /extra-scripts
-for SCRIPT in $(ls /extra-scripts); do
+# Execute any scripts found in /extra_scripts
+for SCRIPT in $(ls /extra_scripts); do
     bash -c $SCRIPT
 done

apps/ubuntu/Dockerfile

@@ -104,10 +104,10 @@ RUN \
 ENV LANG en_US.UTF-8
 
 VOLUME ["/config"]
-RUN mkdir -p /extra-scripts \
-    && chown -R notroot:notroot /extra-scripts \
-    && chmod -R 775 /extra-scripts
-COPY --chmod=755 ./apps/ubuntu/scripts /scripts
+RUN mkdir -p /extra_scripts \
+    && chown -R notroot:notroot /extra_scripts \
+    && chmod -R 775 /extra_scripts
+COPY --chmod=755 ./apps/ubuntu/scripts /prom_scripts
 COPY --from=builder /go/bin/envsubst /usr/local/bin/envsubst
 COPY --chmod=0755 apps/ubuntu/base-entrypoint.sh /base-entrypoint.sh
 COPY --chmod=0755 apps/ubuntu/promknight-entrypoint.sh /promknight-entrypoint.sh

apps/ubuntu/base-entrypoint.sh

@@ -4,10 +4,10 @@ set -e
 
 echo "Based on work by funky penguin @elfhosted/containers"
 
-source "/scripts/wait-for-vpn.sh"
-source "/scripts/wait-for-urls.sh"
-source "/scripts/wait-for-mounts.sh"
-source "/scripts/umask.sh"
-source "/scripts/extra-scripts.sh"
+source "/prom_scripts/wait-for-vpn.sh"
+source "/prom_scripts/wait-for-urls.sh"
+source "/prom_scripts/wait-for-mounts.sh"
+source "/prom_scripts/umask.sh"
+source "/prom_scripts/extra-scripts.sh"
 
 exec /promknight-entrypoint.sh

apps/ubuntu/scripts/extra-scripts.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 # Execute any scripts found in /extra-scripts
-for SCRIPT in $(ls /extra-scripts); do
+for SCRIPT in $(ls /extra_scripts); do
     bash -c $SCRIPT
 done