Use container_volumes_dir

containers/gitea.fish

@@ -1,7 +1,8 @@
 #!/usr/bin/fish
 
 set -l container_name gitea
-set -l gitea_data_dir ~/volumes/gitea/data
+set -l container_volumes_dir ~/volumes/$container_name
+set -l gitea_data_dir $container_volumes_dir/data
 
 mkdir -p $gitea_data_dir
 

containers/nginx.fish

@@ -1,11 +1,12 @@
 #!/usr/bin/fish
 
 set -l container_name nginx
+set -l container_volumes_dir ~/volumes/$container_name
 
 podman-default-create \
     $container_name \
     --network traefik \
-    -v ~/volumes/$container_name/sites:/volumes/sites:z,ro \
+    -v $container_volumes_dir/sites:/volumes/sites:z,ro \
     -v ~/sync/volumes/$container_name/conf.d:/etc/nginx/conf.d:Z,ro \
     --label "io.containers.autoupdate=registry" \
     docker.io/library/nginx:alpine

containers/traefik.fish

@@ -1,8 +1,9 @@
 #!/usr/bin/fish
 
 set -l container_name traefik
-set -l logs_dir ~/volumes/$container_name/logs
-set -l certs_dir ~/volumes/$container_name/certs
+set -l container_volumes_dir ~/volumes/$container_name
+set -l logs_dir $container_volumes_dir/logs
+set -l certs_dir $container_volumes_dir/certs
 
 mkdir -p $logs_dir
 mkdir -p $certs_dir

containers/webhook.fish

@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 set -l container_name webhook
+set -l container_volumes_dir ~/volumes/$container_name
 set -l repo_dir ~/code/webhook
 
 buildah rm compiler &>/dev/null
@@ -15,7 +16,7 @@ buildah copy --from compiler builder /main /webhook/main
 
 buildah rm compiler
 
-buildah copy builder $repo_dir/secrets.json /webhook
+buildah copy builder $repo_dir/config.json /webhook
 buildah copy builder $HOME/bin/hugo /usr/local/bin/hugo
 buildah run builder -- apk --no-cache --update add git git-lfs
 buildah run builder -- git lfs install
@@ -37,5 +38,5 @@ podman-default-create \
     $container_name \
     --network traefik \
     -v ~/volumes/nginx/sites:/volumes/sites:z \
-    -v ~/volumes/webhook/repos:/volumes/repos:Z \
+    -v $container_volumes_dir/repos:/volumes/repos:Z \
     localhost/$container_name:latest