chore: update ignore files and CI workflows for better configuration management

- Modified `.dockerignore` and `.gitignore` to ensure local environment files (`.env`) are properly ignored across all directories.
- Updated CI workflows in `ci_deploy_pr_branch.yml`, `ci_tests.yml`, and `deploy.yml` to replace `git pull --ff-only` with `git checkout -B` for better handling of branch synchronization, avoiding issues with divergent local clones.

Author: bialger

.dockerignore

@@ -17,5 +17,5 @@ cmake-build-release
 # Misc
 **/.cache
 **/*.log
-.env
+**/.env
 deploy/.env

.github/workflows/ci_deploy_pr_branch.yml

@@ -188,9 +188,8 @@ jobs:
             cd /opt/vox-server
             _d "repo root $(pwd)"
             git fetch origin "${BRANCH}"
-            git checkout "${BRANCH}"
-            git pull --ff-only origin "${BRANCH}"
-            _d "--- after git pull ---"
+            git checkout -B "${BRANCH}" "origin/${BRANCH}"
+            _d "--- after git sync ---"
             git rev-parse HEAD && git status -sb || true
             if [ ! -d deploy ]; then
               _d "ERROR: $(pwd)/deploy is not a directory"; exit 1

.github/workflows/ci_tests.yml

@@ -150,9 +150,8 @@ jobs:
             cd /opt/vox-server
             _d "repo root $(pwd)"
             git fetch origin "${BRANCH}"
-            git checkout "${BRANCH}"
-            git pull --ff-only origin "${BRANCH}"
-            _d "--- after git pull ---"
+            git checkout -B "${BRANCH}" "origin/${BRANCH}"
+            _d "--- after git sync ---"
             git rev-parse HEAD && git status -sb || true
             if [ ! -d deploy ]; then
               _d "ERROR: $(pwd)/deploy is not a directory"; exit 1

.github/workflows/deploy.yml

@@ -61,10 +61,10 @@ jobs:
             _d "IMAGE=${IMAGE} branch=${{ github.event.inputs.branch }} deploy_path=${{ github.event.inputs.deploy_path }}"
             cd "${{ github.event.inputs.deploy_path }}"
             _d "repo root $(pwd)"
+            # Match remote tip (avoids failed ff-only pulls after branch switches / divergent local clones)
             git fetch origin "${{ github.event.inputs.branch }}"
-            git checkout "${{ github.event.inputs.branch }}"
-            git pull --ff-only origin "${{ github.event.inputs.branch }}"
-            _d "--- after git pull ---"
+            git checkout -B "${{ github.event.inputs.branch }}" "origin/${{ github.event.inputs.branch }}"
+            _d "--- after git sync ---"
             git rev-parse HEAD && git status -sb || true
             if [ ! -d deploy ]; then
               _d "ERROR: $(pwd)/deploy is not a directory"; exit 1

.gitignore

@@ -18,6 +18,10 @@ build/
 CMakePresets.json
 compile_commands.json
 
+# Local config files
+**/.env
+deploy/nginx/conf.d/20-ssl.conf
+
 # mpeltonen/sbt-idea plugin
 **.idea_modules/