Auto Merge of PR 42 - immich-modifications-dagu-removal-in-fixes

Merged by Trez.One
This commit is contained in:
2025-01-31 08:28:41 -05:00
2 changed files with 7 additions and 19 deletions
@@ -286,25 +286,13 @@ jobs:
- name: Generate .env file for deployment - name: Generate .env file for deployment
run: | run: |
vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
- name: Detect modified services
id: detect-modified-services
run: |
git diff --name-only HEAD^ HEAD | grep docker-compose.yml > /dev/null
if [ $? -eq 0 ]; then
modified_services=$(git diff HEAD^ HEAD -- docker-compose.yml | grep -E '^\+[[:space:]]+[a-zA-Z0-9_-]+:' | sed -E 's/^\+[[:space:]]+([a-zA-Z0-9_-]+):.*/\1/')
echo "Modified services: $modified_services"
echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
else
echo "No changes in docker-compose.yml"
echo "modified_services=" >> $GITHUB_OUTPUT
fi
- name: Docker Compose Deployment - name: Docker Compose Deployment
if: ${{ steps.detect-modified-services.outputs.modified_services != '' }} if: ${{ steps.detect-modified-services.outputs.modified_services != '' }}
continue-on-error: true continue-on-error: true
uses: keatonLiu/docker-compose-remote-action@v1.2 uses: keatonLiu/docker-compose-remote-action@v1.2
with: with:
docker_compose_file: docker-compose.yml docker_compose_file: docker-compose.yml
docker_args: -d --remove-orphans --pull missing --parallel -1 docker_args: -d --remove-orphans --pull missing --parallel -1 --no-recreate
ssh_user: gitea-deploy ssh_user: gitea-deploy
ssh_host: 192.168.1.254 ssh_host: 192.168.1.254
ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}
+6 -6
View File
@@ -2004,12 +2004,12 @@ services:
timeout: 5s timeout: 5s
image: alangrainger/immich-public-proxy:latest image: alangrainger/immich-public-proxy:latest
labels: labels:
homepage: enable swag: enable
homepage_proto: http swag_proto: http
homepage_port: 3000 swag_port: 3000
homepage_url: pics.${MY_TLD} swag_url: pics.${MY_TLD}
homepage.uptime-kuma.enabled: true swag.uptime-kuma.enabled: true
homepage.uptime-kuma.monitor.url: https://pics.${MY_TLD} swag.uptime-kuma.monitor.url: https://pics.${MY_TLD}
homepage.group: Lifestyle homepage.group: Lifestyle
homepage.name: Immich homepage.name: Immich
homepage.href: https://pics.${MY_TLD} homepage.href: https://pics.${MY_TLD}