public/librenotes
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

ci(deploy): always pin LIBRENOTES_IMAGE and git pull on remote

Browse Source 
First deploy now works without manual .env priming: the remote step
unconditionally rewrites LIBRENOTES_IMAGE, then runs git pull --ff-only
so the host picks up the renamed compose.* files before pull/up.
This commit is contained in:
libretech
2026-04-29 11:46:21 +02:00
parent 2784e0fa7c
commit c654ca42fc
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deploy.yml
+4 -7
View File
@@ -38,7 +38,6 @@ jobs:
if: ${{ vars.DEPLOY_ENABLED == 'true' }} if: ${{ vars.DEPLOY_ENABLED == 'true' }}
outputs: outputs:
image_ref: ${{ steps.tags.outputs.image_ref }} image_ref: ${{ steps.tags.outputs.image_ref }}
is_tag: ${{ steps.tags.outputs.is_tag }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -60,13 +59,11 @@ jobs:
echo "tags=${BASE}:${TAG},${BASE}:latest" >> "$GITHUB_OUTPUT" echo "tags=${BASE}:${TAG},${BASE}:latest" >> "$GITHUB_OUTPUT"
echo "version=${TAG}" >> "$GITHUB_OUTPUT" echo "version=${TAG}" >> "$GITHUB_OUTPUT"
echo "image_ref=${BASE}:${TAG}" >> "$GITHUB_OUTPUT" echo "image_ref=${BASE}:${TAG}" >> "$GITHUB_OUTPUT"
echo "is_tag=true" >> "$GITHUB_OUTPUT"
else else
SHA7="${GITHUB_SHA::7}" SHA7="${GITHUB_SHA::7}"
echo "tags=${BASE}:main,${BASE}:${SHA7}" >> "$GITHUB_OUTPUT" echo "tags=${BASE}:main,${BASE}:${SHA7}" >> "$GITHUB_OUTPUT"
echo "version=${SHA7}" >> "$GITHUB_OUTPUT" echo "version=${SHA7}" >> "$GITHUB_OUTPUT"
echo "image_ref=${BASE}:main" >> "$GITHUB_OUTPUT" echo "image_ref=${BASE}:main" >> "$GITHUB_OUTPUT"
echo "is_tag=false" >> "$GITHUB_OUTPUT"
fi fi
- uses: docker/build-push-action@v6 - uses: docker/build-push-action@v6
@@ -102,19 +99,19 @@ jobs:
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
IMAGE_REF: ${{ needs.build.outputs.image_ref }} IMAGE_REF: ${{ needs.build.outputs.image_ref }}
IS_TAG: ${{ needs.build.outputs.is_tag }}
run: | run: |
REMOTE_CMD='cd "$DEPLOY_PATH" || exit 1 REMOTE_CMD='cd "$DEPLOY_PATH" || exit 1
if [ "$IS_TAG" = "true" ]; then git pull --ff-only
# Always pin LIBRENOTES_IMAGE so first deploy works without manual
# .env priming and so rollback only ever needs an .env edit.
perl -i -pe "s|^LIBRENOTES_IMAGE=.*|LIBRENOTES_IMAGE=$IMAGE_REF|" .env perl -i -pe "s|^LIBRENOTES_IMAGE=.*|LIBRENOTES_IMAGE=$IMAGE_REF|" .env
grep -q "^LIBRENOTES_IMAGE=" .env || echo "LIBRENOTES_IMAGE=$IMAGE_REF" >> .env grep -q "^LIBRENOTES_IMAGE=" .env || echo "LIBRENOTES_IMAGE=$IMAGE_REF" >> .env
fi
docker compose -f compose.yaml -f compose.netcup.yaml pull docker compose -f compose.yaml -f compose.netcup.yaml pull
docker compose -f compose.yaml -f compose.netcup.yaml up -d --remove-orphans' docker compose -f compose.yaml -f compose.netcup.yaml up -d --remove-orphans'
ssh -i ~/.ssh/id_deploy \ ssh -i ~/.ssh/id_deploy \
-o StrictHostKeyChecking=accept-new \ -o StrictHostKeyChecking=accept-new \
"$DEPLOY_HOST" \ "$DEPLOY_HOST" \
"DEPLOY_PATH='$DEPLOY_PATH' IMAGE_REF='$IMAGE_REF' IS_TAG='$IS_TAG' bash -s" <<< "$REMOTE_CMD" "DEPLOY_PATH='$DEPLOY_PATH' IMAGE_REF='$IMAGE_REF' bash -s" <<< "$REMOTE_CMD"
- name: Verify health - name: Verify health
env: env: