refactor(scripts): clean up references to networks

Taskfile.yml

@@ -17,6 +17,9 @@ vars:
     sh: git describe --tags --exact-match $(git rev-parse HEAD) 2> /dev/null || echo "dev-$(git rev-parse HEAD)"
 
 tasks:
+  ensure-pod:
+    desc: "Creates the pod if it doesn't already exist."
+    cmd: . ./pod.sh
   build:
     desc: "Builds images for one or more services. Include service names as a space-separated list."
     cmds:
@@ -28,6 +31,7 @@ tasks:
     prefix: "build: {{ .CLI_ARGS }}"
     dir: services
   start:
+    deps: [ensure-pod]
     desc: "Starts one or more services. Include service names as a space-separated list."
     cmds:
       - for: { var: CLI_ARGS }

services/bastion/constants.sh

@@ -3,4 +3,3 @@
 export APP_NAME="bastion"
 export APP_CONTAINER_NAME=$APP_NAME-app
 export APP_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$APP_CONTAINER_NAME
-export NETWORK_NAME=$APP_NAME-local

services/bastion/start.sh

@@ -2,11 +2,9 @@
 
 source constants.sh
 
-podman network create $NETWORK_NAME || echo "Network $NETWORK_NAME already exists"
-
 podman run \
     --detach \
-    --network $NETWORK_NAME \
+    --pod services \
     --name $APP_CONTAINER_NAME \
     --env-file $ENV_FILE_DIR/bastion.env \
     $APP_IMAGE_NAME:$IMAGE_VERSION

services/bitwarden/constants.sh

@@ -5,4 +5,3 @@ export APP_CONTAINER_NAME=$APP_NAME-app
 export APP_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$APP_CONTAINER_NAME
 export DB_CONTAINER_NAME=$APP_NAME-db
 export DB_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$DB_CONTAINER_NAME
-export NETWORK_NAME=$APP_NAME-local

services/bookstack/constants.sh

@@ -5,4 +5,3 @@ export APP_CONTAINER_NAME=$APP_NAME-app
 export APP_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$APP_CONTAINER_NAME
 export DB_CONTAINER_NAME=$APP_NAME-db
 export DB_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$DB_CONTAINER_NAME
-export NETWORK_NAME=$APP_NAME-local

services/deluge/constants.sh

@@ -3,4 +3,3 @@
 export APP_NAME="deluge"
 export APP_CONTAINER_NAME=$APP_NAME-app
 export APP_IMAGE_NAME=$CONTAINER_NAME_PREFIX-$APP_CONTAINER_NAME
-export NETWORK_NAME=$APP_NAME-local

services/deluge/start.sh

@@ -5,6 +5,8 @@ source constants.sh
 podman run \
     --detach \
     --pod services \
+    -e PGUID=1000 \
+    -e PGID=1000 \
     --name $APP_CONTAINER_NAME \
     --env-file $ENV_FILE_DIR/deluge.env \
     --mount type=bind,source=$APP_DATA_DIR/deluge/config,target=/config \