related vs pre_reqs

padhi-homelab · Jan 22, 2025 · ac64bc8 · ac64bc8
1 parent d8e771d
commit ac64bc8
Show file tree

Hide file tree

Showing 36 changed files with 102 additions and 97 deletions.
diff --git a/.github/workflows/compose-test_airdcpp.yml b/.github/workflows/compose-test_airdcpp.yml
@@ -32,7 +32,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -41,7 +41,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_gitea.yml b/.github/workflows/compose-test_gitea.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_hass.yml b/.github/workflows/compose-test_hass.yml
@@ -29,7 +29,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -38,7 +38,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_indexarr.yml b/.github/workflows/compose-test_indexarr.yml
@@ -32,7 +32,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -41,7 +41,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_monitarr.yml b/.github/workflows/compose-test_monitarr.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_navidrome.yml b/.github/workflows/compose-test_navidrome.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_netbox.yml b/.github/workflows/compose-test_netbox.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_nextcloud.yml b/.github/workflows/compose-test_nextcloud.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_ntfy.yml b/.github/workflows/compose-test_ntfy.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_pihole.yml b/.github/workflows/compose-test_pihole.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_qbittorrent.yml b/.github/workflows/compose-test_qbittorrent.yml
@@ -32,7 +32,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -41,7 +41,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_tang.yml b/.github/workflows/compose-test_tang.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_teslamate.yml b/.github/workflows/compose-test_teslamate.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_tiny_httpd.yml b/.github/workflows/compose-test_tiny_httpd.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/compose-test_uptime.yml b/.github/workflows/compose-test_uptime.yml
@@ -30,7 +30,7 @@ jobs:
       -
         name: "Service: Start"
         run: |
-          ./comp up --skip-prereqs --labels ignore ${TARGET_SERVICE}
+          ./comp up --skip-related --labels ignore ${TARGET_SERVICE}
       -
         name: "Service: Wait"
         run: |
@@ -39,7 +39,7 @@ jobs:
       -
         name: "Service: Test"
         run: |
-          if ! ./comp status --skip-prereqs ${TARGET_SERVICE}; then
+          if ! ./comp status --skip-related ${TARGET_SERVICE}; then
             docker ps
             cd ${TARGET_SERVICE} ; docker compose logs
             exit 1

diff --git a/.github/workflows/config/docker-compose.vpn-proxy-expose.yml b/.github/workflows/config/docker-compose.vpn-proxy-expose.yml
@@ -0,0 +1,8 @@
+networks:
+  proxy:
+    external: true
+
+services:
+  vpn:
+    networks:
+    - proxy
diff --git a/_scripts/test_comp.sh b/_scripts/test_comp.sh
@@ -132,7 +132,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
       exit_on_failure
 
 SETUP "status reports $TARGET_COMP_1_DISPLAY is unhealthy" \
-      "status -P $TARGET_COMP_1"
+      "status -R $TARGET_COMP_1"
 CHECK $'grep -qs "Executing status on $TARGET_COMP_1" "$COMP_OUT_PATH"' \
       "Info at beginning of execution"
 CHECK $'grep -qs "Unhealthy service:" "$COMP_ERR_PATH"' \
@@ -147,7 +147,7 @@ fragments:
 EOF
 
 SETUP "bad fragment value in meta breaks $TARGET_COMP_1_DISPLAY" \
-      "overrides -P $TARGET_COMP_1"
+      "overrides -R $TARGET_COMP_1"
 CHECK $'grep -qs "Invalid value \'nyet\' for \'DEVICES\' in $TARGET_COMP_1/meta.override.yml" "$COMP_ERR_PATH"' \
       "Configuration error reported for $TARGET_COMP_1_DISPLAY" \
       exit_on_failure
@@ -161,7 +161,7 @@ fragments:
 EOF
 
 SETUP "querying the overrides list for $TARGET_COMP_1_DISPLAY otherwise passes" \
-      "overrides -P $TARGET_COMP_1"
+      "overrides -R $TARGET_COMP_1"
 CHECK $'grep -qs "Executing overrides on $TARGET_COMP_1" "$COMP_OUT_PATH"' \
       "Info at beginning of execution"
 CHECK $'grep -qs "\[L\] $TARGET_COMP_1/meta.override.yml" "$COMP_OUT_PATH"' \
@@ -171,7 +171,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
       exit_on_failure
 
 SETUP "$TARGET_COMP_1_DISPLAY can be started without prerequisites" \
-      "up -P $TARGET_COMP_1"
+      "up -R $TARGET_COMP_1"
 CHECK $'grep -qs "Executing up on $TARGET_COMP_1" "$COMP_OUT_PATH"' \
       "Info at beginning of execution"
 CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
@@ -192,7 +192,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq $EXIT_CODE_SIMPLE_VERB_FAILURE ]' \
 _WAIT 30s "$TARGET_COMP_1_DISPLAY to start up and emit health status"
 
 SETUP "that status reports $TARGET_COMP_1_DISPLAY is healthy" \
-      "status -P $TARGET_COMP_1"
+      "status -R $TARGET_COMP_1"
 CHECK $'grep -qs "Executing status on $TARGET_COMP_1" "$COMP_OUT_PATH"' \
       "Info at beginning of execution"
 CHECK $'grep -qs "$TARGET_COMP_1 is healthy" "$COMP_OUT_PATH"' \
@@ -240,7 +240,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
 _INIT tiny_httpd
 
 SETUP "$TARGET_COMP_1_DISPLAY & $TARGET_COMP_2_DISPLAY may be started with different fragments" \
-      "up -P $TARGET_COMP_1 $TARGET_COMP_2"
+      "up -R $TARGET_COMP_1 $TARGET_COMP_2"
 CHECK $'grep -lPqsz "Executing up on $TARGET_COMP_1.*\\n.*Disabled fragments: DEVICES \(conf\)" "$COMP_OUT_PATH"' \
       "Info with disabled fragments at beginning of $TARGET_COMP_1_DISPLAY execution" \
       exit_on_failure
@@ -257,7 +257,7 @@ fragments:
 EOF
 
 SETUP "a bad fragment breaks $TARGET_COMP_1_DISPLAY but $TARGET_COMP_2_DISPLAY still works without fragments" \
-      "down -P $TARGET_COMP_1 $TARGET_COMP_2"
+      "down -R $TARGET_COMP_1 $TARGET_COMP_2"
 CHECK $'grep -qs "Invalid value \'nyet\' for \'DEVICES\' in $TARGET_COMP_1/meta.override.yml" "$COMP_ERR_PATH"' \
       "Configuration error reported for $TARGET_COMP_1_DISPLAY" \
       exit_on_failure
@@ -272,7 +272,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq $EXIT_CODE_FRAGMENTS_ERROR ]' \
       exit_on_failure
 
 SETUP "$TARGET_COMP_1_DISPLAY & $TARGET_COMP_2_DISPLAY can both be stopped when ignoring overrides" \
-      "down -P -O $TARGET_COMP_1 $TARGET_COMP_2"
+      "down -R -O $TARGET_COMP_1 $TARGET_COMP_2"
 CHECK $'grep -Pqs "Container $TARGET_COMP_1.* Removed" "$COMP_ERR_PATH"' \
       "Stopped $TARGET_COMP_1_DISPLAY successfully" \
       exit_on_failure
@@ -286,7 +286,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
 _INIT tang _.test.very_ .bad.name_
 
 SETUP "starting $TARGET_COMP_3_DISPLAY works" \
-      "up -P $TARGET_COMP_3"
+      "up -R $TARGET_COMP_3"
 CHECK $'grep -qs "drops all \'\.\' from project name" "$COMP_ERR_PATH"' \
       "Name validation error due to '.'"
 CHECK $'grep -qs "drops leading \'_\' from project name" "$COMP_ERR_PATH"' \
@@ -298,7 +298,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
 _WAIT 30s "$TARGET_COMP_3_DISPLAY to start up and emit health status"
 
 SETUP "status reports $TARGET_COMP_3_DISPLAY is healthy" \
-      "status -P $TARGET_COMP_3"
+      "status -R $TARGET_COMP_3"
 CHECK $'grep -qs "drops all \'\.\' from project name" "$COMP_ERR_PATH"' \
       "Name validation error due to '.'"
 CHECK $'grep -qs "drops leading \'_\' from project name" "$COMP_ERR_PATH"' \

diff --git a/airdcpp/meta.yml b/airdcpp/meta.yml
@@ -5,5 +5,5 @@ messages:
       ${_THIS_COMPOSITION_} may now be accessed on
       ${_LINK_FONT_}https://${SERVER_WAN_FQDN}:${SERVER_WAN_HTTPS_PORT}/${AIRDCPP_BASE_PATH}/${_RESET_FONT_}
 
-pre_reqs:
+related:
 - traefik