more changes for tidploy 0.11

DSAV-Dodeka · Dec 15, 2023 · 7abe5b3 · 7abe5b3
1 parent 507bc16
commit 7abe5b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/deploy/build/deploy/staging/confspawn_entrypoint.sh b/deploy/build/deploy/staging/confspawn_entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-export COMPOSE_PROJECT_NAME="{{ main.project }}-${DEPLOY_NAME}"
-export NETWORK_NAME="{{ main.docker_net_name }}-${DEPLOY_NAME}"
-export KV_VERSION=staging${DEPLOY_TAG_SUFFIX}
-export DB_VERSION=staging${DEPLOY_TAG_SUFFIX}
-export SERVER_VERSION=staging${DEPLOY_TAG_SUFFIX}
+export COMPOSE_PROJECT_NAME="{{ main.project }}-${TIDPLOY_TAG}"
+export NETWORK_NAME="{{ main.docker_net_name }}-${TIDPLOY_TAG}"
+export KV_VERSION=staging-${TIDPLOY_SHA}
+export DB_VERSION=staging-${TIDPLOY_SHA}
+export SERVER_VERSION=staging-${TIDPLOY_SHA}
 docker compose --env-file staging.env --profile all pull
 docker compose --env-file staging.env --profile all up -d
diff --git a/deploy/build/deploy/staging/dployer.sh b/deploy/build/deploy/staging/dployer.sh
@@ -22,7 +22,7 @@ mkfifo deploypipe
 docker run \
   -e BWS_ACCESS_TOKEN \
   -v ./deploypipe:/dployer/ti_dploy_pipe \
-  -v "./tidploy.json:/dployer/tidploy.json" \
+  -v "./secrets.json:/dployer/secrets.json" \
   ghcr.io/tiptenbrink/bws-dployer:latest & \
 ./source.sh ./deploypipe
 # finally we clean up the pipe by removing it

diff --git a/deploy/use/staging/dployer.sh b/deploy/use/staging/dployer.sh
@@ -22,7 +22,7 @@ mkfifo deploypipe
 docker run \
   -e BWS_ACCESS_TOKEN \
   -v ./deploypipe:/dployer/ti_dploy_pipe \
-  -v "./tidploy.json:/dployer/tidploy.json" \
+  -v "./secrets.json:/dployer/secrets.json" \
   ghcr.io/tiptenbrink/bws-dployer:latest & \
 ./source.sh ./deploypipe
 # finally we clean up the pipe by removing it

diff --git a/deploy/use/staging/entrypoint.sh b/deploy/use/staging/entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-export COMPOSE_PROJECT_NAME="dodeka-${DEPLOY_NAME}"
-export NETWORK_NAME="dodeka-${DEPLOY_NAME}"
-export KV_VERSION=staging${DEPLOY_TAG_SUFFIX}
-export DB_VERSION=staging${DEPLOY_TAG_SUFFIX}
-export SERVER_VERSION=staging${DEPLOY_TAG_SUFFIX}
+export COMPOSE_PROJECT_NAME="dodeka-${TIDPLOY_TAG}"
+export NETWORK_NAME="dodeka-${TIDPLOY_TAG}"
+export KV_VERSION=staging-${TIDPLOY_SHA}
+export DB_VERSION=staging-${TIDPLOY_SHA}
+export SERVER_VERSION=staging-${TIDPLOY_SHA}
 docker compose --env-file staging.env --profile all pull
 docker compose --env-file staging.env --profile all up -d