From f011b3811ee7d517cf369c963db23951fcecb8ea Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:47:59 -0500 Subject: [PATCH 01/12] Removing Komodo in favor of Dockge. --- docker-compose.yml | 94 ++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 66 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4159c33b..3cde7372 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -947,6 +947,34 @@ services: source: /var/run/docker.sock target: /var/run/docker.sock type: bind + dockge: + container_name: dockge + depends_on: + docker_socket_proxy: + condition: service_started + required: true + environment: + DOCKGE_STACKS_DIR: /opt/stacks + image: louislam/dockge:latest + labels: + homepage.group: System Administration + homepage.name: Dockge + homepage.href: https://dockge.${MY_TLD} + homepage.icon: dockge.svg + homepage.description: Docker Stack/Container Management + swag: enable + swag_port: 5001 + swag_proto: http + swag_url: dockge.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://deluge.${MY_TLD} + ports: + - 5002:5001 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/dockge:/app/data + - ${HOME}/rinoa-docker:/opt/stacks + docuseal: container_name: docuseal image: docuseal/docuseal:latest @@ -2685,70 +2713,6 @@ services: published: "22300" target: 22300 restart: unless-stopped - komodo-core: - container_name: komodo-core - depends_on: - - komodo-ferretdb - - komodo-periphery - image: ghcr.io/mbecker20/komodo:latest - labels: - homepage.group: System Administration - homepage.name: Komodo - homepage.href: https://komodo.${MY_TLD} - homepage.icon: /icons/komodo.png - homepage.description: Open-source note taking & to-do - komodo.skip: a - swag: enable - swag_url: komodo.${MY_TLD} - swag_port: 9120 - swag_proto: http - ports: - - 9120:9120 - restart: always - volumes: - - ${DOCKER_VOLUME_CONFIG}/komodo/core.config.toml:/config/config.toml - komodo-ferretdb: - container_name: komodo-ferretdb - depends_on: - - komodo-pg-db - image: ghcr.io/ferretdb/ferretdb - labels: - komodo.skip: a - restart: unless-stopped - expose: - - 27017 - environment: - - FERRETDB_POSTGRESQL_URL=postgres://komodo-pg-db:5432/komodo - komodo-periphery: - container_name: komodo-periphery - environment: - DOCKER_HOST: tcp://dockerproxy:2375 - PERIPHERY_PASSKEYS: ${KOMODO_PASSKEY} - PERIPHERY_SSL_ENABLED: false - PERIPHERY_INCLUDE_DISK_MOUNTS: /etc/hostname - # PERIPHERY_EXCLUDE_DISK_MOUNTS: /snap,/etc/repos - expose: - - 8120 - image: ghcr.io/mbecker20/periphery:latest - labels: - komodo.skip: a - restart: always - volumes: - - /proc:/proc - komodo-pg-db: - container_name: komodo-pg-db - environment: - POSTGRES_USER: komodo - POSTGRES_PASSWORD: ${KOMODO_PG_DB_PASSWORD} - POSTGRES_DB: komodo - expose: - - 5432 - labels: - komodo.skip: a - image: postgres:17-alpine - restart: unless-stopped - volumes: - - komodo-pg-data:/var/lib/postgresql/data librespeed: container_name: librespeed environment: @@ -7118,8 +7082,6 @@ volumes: name: jitsi-web-admin-upload joplin_data: name: joplin_data - komodo-pg-data: - name: komodo-pg-data lldap_data: name: lldap_data localai_data: From 2b7c2eb60e5e983e29cba9c31cfe16aaf5bd8082 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:50:47 -0500 Subject: [PATCH 02/12] Tweaking PR create step. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 7275e197..1ea2e5f9 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR - if: steps.check-opened-pr-step.outputs.exists == 0 + if: ${{ steps.check-opened-pr-step.outputs.exists == 0 }} run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa From 6a25dde35fd9aa45975662861372810435dcb23c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:52:24 -0500 Subject: [PATCH 03/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 1ea2e5f9..e6d95249 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR - if: ${{ steps.check-opened-pr-step.outputs.exists == 0 }} + if: ${{ steps.check-opened-pr-step.outputs.exists = 0 }} run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa From 227230f11a18c488feade13877cc0424d3feb0e1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:53:07 -0500 Subject: [PATCH 04/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index e6d95249..1ea2e5f9 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR - if: ${{ steps.check-opened-pr-step.outputs.exists = 0 }} + if: ${{ steps.check-opened-pr-step.outputs.exists == 0 }} run: | tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa From bbdf7fe13e77ce65206ab5da401be9027d5a9392 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:54:41 -0500 Subject: [PATCH 05/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 1ea2e5f9..2471aab1 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -31,8 +31,6 @@ jobs: - name: Create PR if: ${{ steps.check-opened-pr-step.outputs.exists == 0 }} run: | - tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - tea login default gitea-rinoa echo "Creating PR for branch: ${{ github.ref_name }}" tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} From 9c3a666f49d51081432a6949b1efe4d8b773d45a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:56:49 -0500 Subject: [PATCH 06/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 2471aab1..58cf4aea 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR - if: ${{ steps.check-opened-pr-step.outputs.exists == 0 }} + if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }} run: | echo "Creating PR for branch: ${{ github.ref_name }}" tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} From e436da962caa0e2f061f17aa619867a1cbd40f24 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:58:05 -0500 Subject: [PATCH 07/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 58cf4aea..acb0b688 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -23,8 +23,11 @@ jobs: - name: Check if open PR exists id: check-opened-pr-step run: | + echo "Logging into Gitea..." tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} + echo "Setting default login to gitea-rinoa..." tea login default gitea-rinoa + echo "Checking for existing PRs..." pr_exists=$(tea pr list --repo ${{ github.repository }} --state open | egrep ${{ github.ref_name }} | wc -l) echo "exists=$pr_exists" >> $GITHUB_OUTPUT From dcf9b7e829be2614e3c3ad3cc2757da4433c9c7f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 09:59:02 -0500 Subject: [PATCH 08/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index acb0b688..50a2dbe1 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -22,6 +22,7 @@ jobs: - name: Check if open PR exists id: check-opened-pr-step + continue-on-error: true run: | echo "Logging into Gitea..." tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} @@ -29,6 +30,7 @@ jobs: tea login default gitea-rinoa echo "Checking for existing PRs..." pr_exists=$(tea pr list --repo ${{ github.repository }} --state open | egrep ${{ github.ref_name }} | wc -l) + echo ${pr_exists} echo "exists=$pr_exists" >> $GITHUB_OUTPUT - name: Create PR From 1fe676de60e204e38a1b273d33a49b66cfdf0433 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 10:03:59 -0500 Subject: [PATCH 09/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 50a2dbe1..54841902 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "Setting default login to gitea-rinoa..." tea login default gitea-rinoa echo "Checking for existing PRs..." - pr_exists=$(tea pr list --repo ${{ github.repository }} --state open | egrep ${{ github.ref_name }} | wc -l) + pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | wc -l) echo ${pr_exists} echo "exists=$pr_exists" >> $GITHUB_OUTPUT From 1cfeba0c6f1f9ccf9e878e2d8f4b7bcd15d567a1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 10:11:13 -0500 Subject: [PATCH 10/12] ... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 54841902..91adda09 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -29,7 +29,7 @@ jobs: echo "Setting default login to gitea-rinoa..." tea login default gitea-rinoa echo "Checking for existing PRs..." - pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | wc -l) + pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l) echo ${pr_exists} echo "exists=$pr_exists" >> $GITHUB_OUTPUT From 8820d72f81fbf2fbe257b67abc8e4f5f7d6cd0fc Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 10:12:51 -0500 Subject: [PATCH 11/12] Fixing typo for depends_on. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3cde7372..ca1810d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -950,7 +950,7 @@ services: dockge: container_name: dockge depends_on: - docker_socket_proxy: + docker-socket-proxy: condition: service_started required: true environment: From bae21696d5b43424fab248d7fedc37986414400b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 16 Jan 2025 15:16:12 +0000 Subject: [PATCH 12/12] chore: Update README --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 778cd567..2f3679a5 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ | dagu-server | ghcr.io/dagu-org/dagu:latest | | delugevpn | ghcr.io/binhex/arch-delugevpn:latest | | docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest | +| dockge | louislam/dockge:latest | | docuseal | docuseal/docuseal:latest | | duplicati | lscr.io/linuxserver/duplicati:latest | | fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main | @@ -67,10 +68,6 @@ | jitsi-web | jitsi/web:stable | | joplin-db | postgres:17-alpine | | joplin | joplin/server:latest | -| komodo-core | ghcr.io/mbecker20/komodo:latest | -| komodo-ferretdb | ghcr.io/ferretdb/ferretdb | -| komodo-periphery | ghcr.io/mbecker20/periphery:latest | -| komodo-pg-db | postgres:17-alpine | | librespeed | lscr.io/linuxserver/librespeed:latest | | lidarr | lscr.io/linuxserver/lidarr:latest | | lidify | thewicklowwolf/lidify:latest |