fix git-crypt status check and remove pre-created docker network
git-crypt status outputs " encrypted:" not "***ENCRYPTED***". The shared docker network is created by nginx's compose file, so pre-creating it caused a label mismatch that prevented containers from starting.
This commit is contained in:
@@ -39,7 +39,7 @@ fi
|
|||||||
# --- Unlock git-crypt via Bitwarden ---
|
# --- Unlock git-crypt via Bitwarden ---
|
||||||
|
|
||||||
cd "$REPO_DIR"
|
cd "$REPO_DIR"
|
||||||
if git-crypt status 2>/dev/null | grep -q '^\*\*\*ENCRYPTED\*\*\*'; then
|
if git-crypt status 2>/dev/null | grep -q ' encrypted:'; then
|
||||||
echo "==> Fetching git-crypt key from Bitwarden..."
|
echo "==> Fetching git-crypt key from Bitwarden..."
|
||||||
echo " Log in to Bitwarden when prompted."
|
echo " Log in to Bitwarden when prompted."
|
||||||
if bw status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
|
if bw status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
|
||||||
@@ -87,9 +87,6 @@ chown -R deploy:deploy /home/deploy/.ssh
|
|||||||
echo "==> Making scripts executable..."
|
echo "==> Making scripts executable..."
|
||||||
chmod +x "$REPO_DIR/scripts/"*.sh
|
chmod +x "$REPO_DIR/scripts/"*.sh
|
||||||
|
|
||||||
echo "==> Creating shared Docker network..."
|
|
||||||
docker network create shared 2>/dev/null || true
|
|
||||||
|
|
||||||
echo "==> Logging into Gitea registry..."
|
echo "==> Logging into Gitea registry..."
|
||||||
echo "Run manually: docker login git.timothykim.net"
|
echo "Run manually: docker login git.timothykim.net"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user