Trez/rinoa-docker
4
0
Fork 0
Code Issues 1 Pull Requests 9 Actions Activity

[DOCKER] Automated PR for karakeep-replace-wallabag_2025-06-22T06-53-13 - #81 #81

Merged
gitea-sonarqube-bot merged 12 commits from karakeep-replace-wallabag_2025-06-22T06-53-13 into main 2025-06-22 08:54:29 -04:00
Conversation 0 Commits 12 Files Changed 3
+64 -70
3 changed files with 64 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/pr-cloudflare-docker-deploy.yml
+14 -8
View File
@@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest
needs: [check-and-create-pr]
outputs:
svc_deploy_list: ${{ steps.detected_services.outputs.docker_svc_list }}
svc_deploy_list: ${{ steps.detect_services.outputs.docker_svc_list }}
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -106,12 +106,13 @@ jobs:
echo "Detected service changes:"
cat service_changes.txt
temp_svc_list=$(paste -sd '|' service_changes.txt)
mod_svcs=$(echo "${temp_svc_list}" | sed -e 's/|//g' -e 's/: \(add\|modifi\|delet\)ed/ /g')
echo "docker_svc_list=$mod_svcs" >> "$GITHUB_OUTPUT"
mod_svcs=$(cut -d':' -f1 service_changes.txt | sort | uniq)
echo "docker_svc_list<<EOF" >> "$GITHUB_OUTPUT"
echo "$mod_svcs" >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: Testing service list output
run: |
echo ${{ steps.detected_services.outputs.docker_svc_list }}
echo -e "${{ steps.detect_services.outputs.docker_svc_list }}"
docker-compose-dry-run:
name: Docker Compose Dry Run
needs: [generate-service-list]
@@ -121,6 +122,7 @@ jobs:
VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
VAULT_NAMESPACE: ""
RINOA_REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -139,12 +141,14 @@ jobs:
- name: Generate .env file for Docker Compose
run: |
vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
echo ${DOCKER_SVC_LIST}
- name: Docker Compose Dry Run
uses: hoverkraft-tech/compose-action@v2.2.0
env:
DOCKER_HOST: tcp://dockerproxy:2375
with:
services: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
services: |
${{ needs.generate-service-list.outputs.svc_deploy_list }}
up-flags: -d --remove-orphans --dry-run
down-flags: --dry-run
compose-flags: --dry-run
@@ -304,7 +308,7 @@ jobs:
VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
DOCKER_HOST: tcp://dockerproxy:2375
RINOA_REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
DOCKER_SVC_LIST: ${{ needs.docker-compose-dry-run.outputs.svc_deploy_list }}
DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -331,12 +335,14 @@ jobs:
- name: Generate .env file for deployment
run: |
vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
echo ${DOCKER_SVC_LIST}
- name: Docker Compose Deployment
uses: hoverkraft-tech/compose-action@v2.2.0
env:
DOCKER_HOST: tcp://dockerproxy:2375
with:
services: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
services: |
${{ needs.generate-service-list.outputs.svc_deploy_list }}
up-flags: -d --remove-orphans
down-flags: --dry-run
- name: Check Services' Healthiness
README.md
+3 -2
View File
@@ -19,6 +19,7 @@
| browserless | ghcr.io/browserless/chromium:latest |
| bytestash | ghcr.io/jordan-dalby/bytestash:latest |
| castopod | castopod/castopod:latest |
| chrome | gcr.io/zenika-hub/alpine-chrome:123 |
| cloudflareddns | ghcr.io/hotio/cloudflareddns:latest |
| convertx | ghcr.io/c4illin/convertx |
| cronicle | elestio/cronicle:latest |
@@ -72,6 +73,7 @@
| jitsi-web | jitsi/web:stable |
| joplin-db | postgres:17-alpine |
| joplin | joplin/server:latest |
| karakeep | ghcr.io/karakeep-app/karakeep:release |
| languagetool | elestio/languagetool:latest |
| librechat-api | ghcr.io/danny-avila/librechat-dev:latest |
| librechat-vectordb | ankane/pgvector:latest |
@@ -90,7 +92,7 @@
| maxun-backend | getmaxun/maxun-backend:latest |
| maxun-frontend | getmaxun/maxun-frontend:latest |
| maxun-pg-db | postgres:13-alpine |
| meilisearch | getmeili/meilisearch:v1.12.3 |
| meilisearch | getmeili/meilisearch:v1.13.3 |
| minio | minio/minio:RELEASE.2025-04-22T22-12-26Z |
| mixpost | inovector/mixpost:latest |
| mongodb | bitnami/mongodb:7.0 |
@@ -154,7 +156,6 @@
| unmanic | josh5/unmanic:latest |
| uptimekuma | louislam/uptime-kuma:latest |
| vault | hashicorp/vault:latest |
| wallabag | wallabag/wallabag |
| wallos | bellamy/wallos:latest |
| watchtower | ghcr.io/containrrr/watchtower:latest |
| web-check | lissy93/web-check |
docker-compose.yml
+47 -60
View File
@@ -153,6 +153,7 @@ services:
homepage.widget.username: admin
homepage.widget.password: ${ADGUARD_PASSWORD}
network_mode: host
privileged: true
# ports:
# - "192.168.1.254:53:53/udp"
# - "192.168.1.254:53:53/tcp"
@@ -620,6 +621,17 @@ services:
restart: unless-stopped
volumes:
- castopod-media:/var/www/castopod/public/media
chrome:
container_name: chrome
command:
- --no-sandbox
- --disable-gpu
- --disable-dev-shm-usage
- --remote-debugging-address=0.0.0.0
- --remote-debugging-port=9222
- --hide-scrollbars
image: gcr.io/zenika-hub/alpine-chrome:123
restart: unless-stopped
cloudflareddns:
container_name: cloudflareddns
environment:
@@ -2729,6 +2741,36 @@ services:
ports:
- 22300:22300
restart: unless-stopped
karakeep:
container_name: karakeep
image: ghcr.io/karakeep-app/karakeep:release
environment:
BROWSER_WEB_URL: http://chrome:9222
DATA_DIR: /data
INFERENCE_TEXT_MODEL: llama3.3:latest
INFERENCE_IMAGE_MODEL: llava:latest
MEILI_ADDR: http://meilisearch:7700
NEXTAUTH_SECRET: ${KARAKEEP_NEXTAUTH_SECRET}
NEXTAUTH_URL: https://kkeep.${MY_TLD}
OPENAI_API_KEY: ${LIBRECHAT_OPENAI_API_KEY}
OLLAMA_BASE_URL: http://ollama:11434
labels:
homepage.group: Lifestyle
homepage.name: Karakeep
homepage.href: https://kkeep.${MY_TLD}
homepage.icon: karakeep-dark.svg
homepage.description: Self-hosted bookmark-everything app with a touch of AI for data hoarders
swag: enable
swag_url: kkeep.${MY_TLD}
swag_port: 3000
swag.uptime-kuma.enabled: true
swag.uptime-kuma.monitor.url: https://notes.${MY_TLD}
swag.uptime-kuma.monitor.interval: 300
ports:
- 24977:3000
restart: unless-stopped
volumes:
- karakeep-data:/data
languagetool:
container_name: languagetool
environment:
@@ -3248,7 +3290,9 @@ services:
MEILI_HOST: http://meilisearch:7700
MEILI_NO_ANALYTICS: true
MEILI_MASTER_KEY: ${MEILISEARCH_MASTER_KEY}
image: getmeili/meilisearch:v1.12.3
image: getmeili/meilisearch:v1.13.3
ports:
- 7700:7700
restart: always
user: ${PUID}:${PGID}
volumes:
@@ -5270,65 +5314,6 @@ services:
volumes:
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/config/:/vault/config
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/logs/:/vault/logs
wallabag:
container_name: wallabag
depends_on:
mariadb:
condition: service_started
required: true
restart: true
redis:
condition: service_started
required: true
environment:
SYMFONY__ENV__DATABASE_DRIVER: pdo_mysql
SYMFONY__ENV__DATABASE_HOST: mariadb
SYMFONY__ENV__DATABASE_PORT: 3306
SYMFONY__ENV__DATABASE_NAME: ${WALLABAG_DB}
SYMFONY__ENV__DATABASE_USER: ${WALLABAG_DB}
SYMFONY__ENV__DATABASE_PASSWORD: ${WALLABAG_DB_PASSWORD}
SYMFONY__ENV__DATABASE_CHARSET: utf8
SYMFONY__ENV__DATABASE_TABLE_PREFIX: "wallabag_"
SYMFONY__ENV__MAILER_DSN: smtp://postal-smtp
SYMFONY__ENV__FROM_EMAIL: noreply@trez.wtf
SYMFONY__ENV__DOMAIN_NAME: https://wallabag.${MY_TLD}
SYMFONY__ENV__SERVER_NAME: "Wallabag @ Rinoa"
SYMFONY__ENV__REDIS_HOST: redis
SYMFONY__ENV__REDIS_PORT: 6379
healthcheck:
interval: 1m
test:
- CMD
- wget
- --no-verbose
- --tries=1
- --spider
- http://localhost
timeout: 3s
image: wallabag/wallabag
labels:
swag: enable
swag_address: wallabag
swag_proto: http
swag.uptime-kuma.enabled: true
swag.uptime-kuma.monitor.url: https://wallabag.${MY_TLD}
swag.uptime-kuma.monitor.interval: 300
homepage.group: Lifestyle
homepage.name: Wallabag
homepage.href: https://wallabag.${MY_TLD}
homepage.icon: wallabag.png
homepage.description: Knowledge Store
networks:
default: null
ports:
- 32768:80
restart: unless-stopped
volumes:
- source: ${DOCKER_VOLUME_CONFIG}/wallabag/images
target: /var/www/wallabag/web/assets/images
type: bind
bind:
create_host_path: true
wallos:
container_name: wallos
environment:
@@ -5624,6 +5609,8 @@ volumes:
name: jitsi-web-admin-upload
joplin_data:
name: joplin_data
karakeep-data:
name: karakeep-data
linkstack_data:
name: linkstack_data
librechat-pg-data: