Merge branch 'main' into renovate/ghcr.io-linuxserver-adguardhome-sync
This commit is contained in:
commit
a5a1e574ba
15 changed files with 56 additions and 21 deletions
|
@ -18,7 +18,7 @@ services:
|
|||
capabilities: [gpu]
|
||||
|
||||
open-webui:
|
||||
image: ghcr.io/open-webui/open-webui:v0.3.13
|
||||
image: ghcr.io/open-webui/open-webui:0.3.15
|
||||
container_name: open-webui
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
|
|
@ -107,7 +107,7 @@ services:
|
|||
networks:
|
||||
- gitea_main
|
||||
n8n:
|
||||
image: ghcr.io/n8n-io/n8n:1.55.3
|
||||
image: ghcr.io/n8n-io/n8n:1.56.1
|
||||
container_name: n8n
|
||||
ports:
|
||||
- 5678:5678
|
||||
|
@ -137,7 +137,7 @@ services:
|
|||
ipv4_address: 172.25.0.25
|
||||
|
||||
syncthing:
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d6502d919f49f16a80689ce92c211f945f1d64a34c0d3f23ecc27a2a4d1dd0ac
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d5481de808a1de5a13b814a922b1f6de5fcde64c1ca95b0a065218b56570fae3
|
||||
container_name: syncthing
|
||||
hostname: ARM #optional
|
||||
environment:
|
||||
|
@ -154,7 +154,38 @@ services:
|
|||
- 22000:22000/udp
|
||||
- 21027:21027/udp
|
||||
restart: unless-stopped
|
||||
|
||||
wiki-db:
|
||||
image: postgres:15-alpine
|
||||
environment:
|
||||
POSTGRES_DB: wiki
|
||||
POSTGRES_PASSWORD: $DB_PASS
|
||||
POSTGRES_USER: wikijs
|
||||
logging:
|
||||
driver: "none"
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- db-data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- gitea_main
|
||||
|
||||
wiki:
|
||||
container_name: wiki
|
||||
image: ghcr.io/requarks/wiki:2.5.303
|
||||
depends_on:
|
||||
- wiki-db
|
||||
environment:
|
||||
DB_TYPE: postgres
|
||||
DB_HOST: wiki-db
|
||||
DB_PORT: 5432
|
||||
DB_USER: wikijs
|
||||
DB_PASS: $DB_PASS
|
||||
DB_NAME: wiki
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "1234:3000"
|
||||
networks:
|
||||
- gitea_main
|
||||
|
||||
networks:
|
||||
gitea_main:
|
||||
|
@ -163,3 +194,4 @@ networks:
|
|||
volumes:
|
||||
linkstack:
|
||||
n8n_data:
|
||||
db-data:
|
||||
|
|
|
@ -31,7 +31,7 @@ services:
|
|||
- PGID=1000
|
||||
|
||||
prowlarr:
|
||||
image: ghcr.io/linuxserver/prowlarr@sha256:c80a2dcfefd85c62da2373c5bf0138bb9d1c647c4b3d8f994ce263f5e8b1db81
|
||||
image: ghcr.io/linuxserver/prowlarr@sha256:c93f075dc5afb74dc7a0a55e90974f81425a5d3c5d293022c5416431f4963ce9
|
||||
container_name: prowlarr
|
||||
ports:
|
||||
- "9696:9696"
|
||||
|
@ -57,7 +57,7 @@ services:
|
|||
- PGID=1000
|
||||
|
||||
sonarr:
|
||||
image: ghcr.io/linuxserver/sonarr@sha256:bffa87787eacff9023df4400f521c159566d14b5a280caec8b54196071e6038e
|
||||
image: ghcr.io/linuxserver/sonarr@sha256:0777b308a414000505651059a95af373ded6aba8ce5a40b50d7aad333dc912e2
|
||||
container_name: sonarr
|
||||
ports:
|
||||
- "8989:8989"
|
||||
|
@ -140,7 +140,7 @@ services:
|
|||
image: gcr.io/cadvisor/cadvisor:v0.50.0
|
||||
|
||||
syncthing:
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d6502d919f49f16a80689ce92c211f945f1d64a34c0d3f23ecc27a2a4d1dd0ac
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d5481de808a1de5a13b814a922b1f6de5fcde64c1ca95b0a065218b56570fae3
|
||||
container_name: syncthing
|
||||
hostname: ARRS
|
||||
environment:
|
||||
|
|
|
@ -32,7 +32,7 @@ services:
|
|||
volumes:
|
||||
- redis:/data
|
||||
server:
|
||||
image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
|
||||
image: ghcr.io/goauthentik/server@sha256:ec5683345b6283214e01112dd4ba4ac7af1fc638a6e2301e6c18b7f3036f27bc
|
||||
restart: unless-stopped
|
||||
command: server
|
||||
environment:
|
||||
|
@ -53,7 +53,7 @@ services:
|
|||
- postgresql
|
||||
- redis
|
||||
worker:
|
||||
image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
|
||||
image: ghcr.io/goauthentik/server@sha256:ec5683345b6283214e01112dd4ba4ac7af1fc638a6e2301e6c18b7f3036f27bc
|
||||
restart: unless-stopped
|
||||
command: worker
|
||||
environment:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
services:
|
||||
cf-tunnel:
|
||||
restart: unless-stopped
|
||||
image: cloudflare/cloudflared@sha256:31fc2956d49179f7fd230b030e702e40ade7ccc361d0f1079e4a56bc888678f9
|
||||
image: cloudflare/cloudflared@sha256:5c23f47be85b92930b348c390c84d802f3c0370d5e5278075e73096c4bbfd94b
|
||||
command: tunnel --no-autoupdate run --token $CF_TOKEN
|
||||
|
||||
wallos:
|
||||
|
|
|
@ -8,7 +8,7 @@ services:
|
|||
restart: 'unless-stopped'
|
||||
|
||||
gitea:
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.0'
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.1'
|
||||
links:
|
||||
- docker-in-docker
|
||||
depends_on:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
version: '3.9'
|
||||
services:
|
||||
sabnzbd:
|
||||
image: ghcr.io/linuxserver/sabnzbd@sha256:95179d6de1c660d7dcd4bd3991b33871c88df1120ab84bc553c4a67e8cc412d2
|
||||
image: ghcr.io/linuxserver/sabnzbd@sha256:6a8db539588665971f24a42e31ddf2240d7be114c08007dc409aff7638c8edf6
|
||||
container_name: sabnzbd
|
||||
environment:
|
||||
- PUID=1000
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
services:
|
||||
jellyfin:
|
||||
image: ghcr.io/linuxserver/jellyfin@sha256:a90c9b22a2634c3c24049b35d9bc0295eddfa46615697c92f67794f523a27a3a
|
||||
image: ghcr.io/linuxserver/jellyfin@sha256:0da2fb716f6e7eaeea082d81418f80c4d2adab9407801629790ef3c2d0b743ab
|
||||
container_name: jellyfin
|
||||
devices:
|
||||
- /dev/dri/renderD129:/dev/dri/renderD129
|
||||
|
@ -35,7 +35,7 @@ services:
|
|||
privileged: true
|
||||
|
||||
syncthing:
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d6502d919f49f16a80689ce92c211f945f1d64a34c0d3f23ecc27a2a4d1dd0ac
|
||||
image: ghcr.io/linuxserver/syncthing@sha256:d5481de808a1de5a13b814a922b1f6de5fcde64c1ca95b0a065218b56570fae3
|
||||
container_name: syncthing
|
||||
hostname: JF
|
||||
environment:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
services:
|
||||
netbootxyz:
|
||||
image: ghcr.io/linuxserver/netbootxyz@sha256:cb886a67f45f14e2e864ce713977dd8d3253d997b1fb6cfc627b240a3e0659ea
|
||||
image: ghcr.io/linuxserver/netbootxyz@sha256:069d4a417d550746264ad9ddd5d3a14b6c3de447934ad3416609f2f760ca2e38
|
||||
container_name: netboot
|
||||
environment:
|
||||
- PUID=1000
|
||||
|
|
|
@ -8,7 +8,7 @@ services:
|
|||
restart: 'unless-stopped'
|
||||
|
||||
gitea:
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.0'
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.1'
|
||||
links:
|
||||
- docker-in-docker
|
||||
depends_on:
|
||||
|
|
|
@ -20,7 +20,7 @@ services:
|
|||
restart: 'unless-stopped'
|
||||
|
||||
gitea:
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.0'
|
||||
image: 'code.forgejo.org/forgejo/runner:3.5.1'
|
||||
links:
|
||||
- docker-in-docker
|
||||
depends_on:
|
||||
|
|
|
@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master" {
|
|||
name = "K3s-Master"
|
||||
description = "Kubernetes master"
|
||||
tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
|
||||
started = false
|
||||
|
||||
agent {
|
||||
enabled = true # read 'Qemu guest agent' section, change to true only when ready
|
||||
|
|
|
@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master2" {
|
|||
name = "K3s-Master2"
|
||||
description = "Kubernetes Master"
|
||||
tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
|
||||
started = false
|
||||
|
||||
agent {
|
||||
enabled = true # read 'Qemu guest agent' section, change to true only when ready
|
||||
|
|
|
@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master3" {
|
|||
name = "K3s-Master3"
|
||||
description = "Kubernetes master"
|
||||
tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
|
||||
started = false
|
||||
|
||||
agent {
|
||||
enabled = true # read 'Qemu guest agent' section, change to true only when ready
|
||||
|
|
|
@ -2,17 +2,17 @@ resource "proxmox_virtual_environment_vm" "Runner" {
|
|||
|
||||
# VM General Settings
|
||||
node_name = "prox"
|
||||
vm_id = 207
|
||||
vm_id = 952
|
||||
name = "Runner"
|
||||
description = "Forgejo Runner"
|
||||
tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
|
||||
description = "Forgejo Runner for iac"
|
||||
tags = ["tofu", "ubuntu-22", "iac-repo", "infrastructure"]
|
||||
|
||||
agent {
|
||||
enabled = true # read 'Qemu guest agent' section, change to true only when ready
|
||||
}
|
||||
|
||||
clone {
|
||||
vm_id = 8000
|
||||
vm_id = 8100
|
||||
}
|
||||
|
||||
# VM CPU Settings
|
||||
|
@ -35,7 +35,7 @@ resource "proxmox_virtual_environment_vm" "Runner" {
|
|||
# VM Disk Settings
|
||||
disk {
|
||||
datastore_id = "Fast2Tb"
|
||||
size = 60
|
||||
size = 40
|
||||
interface = "scsi0"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue