Compare commits
1 Commits
main
..
fc39b28bb0
| Author | SHA1 | Date | |
|---|---|---|---|
| fc39b28bb0 |
@@ -209,9 +209,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
||||||
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
||||||
HC_VAULT_AUTH: approle
|
HC_VAULT_AUTH: token
|
||||||
HC_VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }}
|
HC_VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
|
||||||
HC_VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }}
|
|
||||||
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
||||||
|
|
||||||
- name: Pre-pull/build service images in parallel
|
- name: Pre-pull/build service images in parallel
|
||||||
@@ -415,9 +414,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
||||||
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
||||||
HC_VAULT_AUTH: approle
|
HC_VAULT_AUTH: token
|
||||||
HC_VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }}
|
HC_VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
|
||||||
HC_VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }}
|
|
||||||
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
||||||
|
|
||||||
- name: Pre-pull/build service images in parallel
|
- name: Pre-pull/build service images in parallel
|
||||||
|
|||||||
@@ -138,9 +138,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
HC_VAULT_VERSION: ${{ env.HC_VAULT_VERSION }}
|
||||||
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
HC_VAULT_ADDR: ${{ secrets.TREZ_VAULT_ADDR }}
|
||||||
HC_VAULT_AUTH: approle
|
HC_VAULT_AUTH: token
|
||||||
HC_VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }}
|
HC_VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
|
||||||
HC_VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }}
|
|
||||||
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
HC_VAULT_SECRETS_PATH: rinoa-docker/env
|
||||||
|
|
||||||
- name: Docker Compose Deployment
|
- name: Docker Compose Deployment
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: Renovate
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 */2 * * *"
|
- cron: "0/30 * * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -183,7 +183,6 @@
|
|||||||
| unmanic | josh5/unmanic:latest | Library Optimizer |
|
| unmanic | josh5/unmanic:latest | Library Optimizer |
|
||||||
| uptimekuma | louislam/uptime-kuma:latest | HTTP Endpoint Monitoring |
|
| uptimekuma | louislam/uptime-kuma:latest | HTTP Endpoint Monitoring |
|
||||||
| vault | hashicorp/vault:2.0.0-bugfix | HashiCorp Vault for secrets, key/value stores, etc. |
|
| vault | hashicorp/vault:2.0.0-bugfix | HashiCorp Vault for secrets, key/value stores, etc. |
|
||||||
| vault-agent | hashicorp/vault:2.0.0-bugfix | |
|
|
||||||
| wallos | bellamy/wallos:latest | Subscription Tracking |
|
| wallos | bellamy/wallos:latest | Subscription Tracking |
|
||||||
| web-check | lissy93/web-check | Site scanner for attack vectors, architecture, security configs, and more |
|
| web-check | lissy93/web-check | Site scanner for attack vectors, architecture, security configs, and more |
|
||||||
| whodb | clidey/whodb | Lightweight next-gen database explorer |
|
| whodb | clidey/whodb | Lightweight next-gen database explorer |
|
||||||
|
|||||||
+8
-31
@@ -483,7 +483,7 @@ services:
|
|||||||
expose:
|
expose:
|
||||||
- 9091
|
- 9091
|
||||||
- 9959 # Metrics port for Prometheus
|
- 9959 # Metrics port for Prometheus
|
||||||
image: authelia/authelia:master@sha256:4848d39777ede5f11d8123d4c30488a1d418f9d8183ffbb8f624b1a13bf0ec6f
|
image: authelia/authelia:master@sha256:0cd9474b07bbabb2614ed19e330b847b0b87d3f119b72d8d620137b421976334
|
||||||
labels:
|
labels:
|
||||||
homepage.group: Privacy/Security
|
homepage.group: Privacy/Security
|
||||||
homepage.name: Authelia
|
homepage.name: Authelia
|
||||||
@@ -2163,7 +2163,7 @@ services:
|
|||||||
test: wget -q --spider http://localhost:3000/share/healthcheck || exit 1
|
test: wget -q --spider http://localhost:3000/share/healthcheck || exit 1
|
||||||
start_period: 10s
|
start_period: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
image: alangrainger/immich-public-proxy:latest@sha256:759a04f859bd18d51cf70d06756f802df9707b410f3e91dc25787254b6d2099a
|
image: alangrainger/immich-public-proxy:latest@sha256:48c4ea4884b04c77a4a4ec93e190dea6cb7dc1b38acb005a35dd56f68212d85a
|
||||||
labels:
|
labels:
|
||||||
homepage.group: Lifestyle
|
homepage.group: Lifestyle
|
||||||
homepage.name: Immich Public Proxy
|
homepage.name: Immich Public Proxy
|
||||||
@@ -3574,7 +3574,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- maxun-backend
|
- maxun-backend
|
||||||
<<: *maxun-env
|
<<: *maxun-env
|
||||||
image: getmaxun/maxun-frontend:latest@sha256:ac9150566fea38778e350d7f3ef3cf7244539394e5bc3598c1b5c30f41b5b73a
|
image: getmaxun/maxun-frontend:latest@sha256:055c0ded4d1028ab4a6f2b76457299053f0244c0df30cc104370f4b7ac435352
|
||||||
labels:
|
labels:
|
||||||
swag: enable
|
swag: enable
|
||||||
swag_proto: http
|
swag_proto: http
|
||||||
@@ -4303,7 +4303,6 @@ services:
|
|||||||
LDAP_SEARCH_BASE: dc=trez,dc=wtf
|
LDAP_SEARCH_BASE: dc=trez,dc=wtf
|
||||||
LDAP_SEARCH_FILTER: "(objectClass=inetOrgPerson)"
|
LDAP_SEARCH_FILTER: "(objectClass=inetOrgPerson)"
|
||||||
LDAP_USE_TLS: false
|
LDAP_USE_TLS: false
|
||||||
#WEBUI_SECRET_KEY: ${}
|
|
||||||
# LibreTranslate
|
# LibreTranslate
|
||||||
LT_DEBUG: false
|
LT_DEBUG: false
|
||||||
LT_UPDATE_MODELS: true
|
LT_UPDATE_MODELS: true
|
||||||
@@ -4319,7 +4318,7 @@ services:
|
|||||||
WEBSOCKET_MANAGER: redis
|
WEBSOCKET_MANAGER: redis
|
||||||
WEBSOCKET_REDIS_URL: redis://open-webui-valkey:6379/0
|
WEBSOCKET_REDIS_URL: redis://open-webui-valkey:6379/0
|
||||||
REDIS_KEY_PREFIX: open-webui
|
REDIS_KEY_PREFIX: open-webui
|
||||||
image: ghcr.io/open-webui/open-webui:main@sha256:73f93f9ff87bc148105ffdba14ee35f03481a7ebbfaa9b350ebec4210e4b1a45
|
image: ghcr.io/open-webui/open-webui:main@sha256:74093dadc9c6aabc23987a74fd8c2fb8d995b1a5b22e83b0036fb9d6af590e8c
|
||||||
labels:
|
labels:
|
||||||
homepage.group: Personal Tools
|
homepage.group: Personal Tools
|
||||||
homepage.name: Open WebUI
|
homepage.name: Open WebUI
|
||||||
@@ -4934,7 +4933,7 @@ services:
|
|||||||
VPN_PASS: ${DELUGEVPN_ENVIRONMENT_VPN_PASS}
|
VPN_PASS: ${DELUGEVPN_ENVIRONMENT_VPN_PASS}
|
||||||
VPN_PROV: pia
|
VPN_PROV: pia
|
||||||
WEBUI_PORT: 8080
|
WEBUI_PORT: 8080
|
||||||
image: ghcr.io/binhex/arch-qbittorrentvpn:latest@sha256:b61d8a11e022239c4e3b218ae7ebb58d9adc67b59c46280c1812c6d9ccc0e8d1
|
image: ghcr.io/binhex/arch-qbittorrentvpn:latest@sha256:fe6daf82a190902d99350026eccdb883eb1e5f80b23827ba04a29c155815c696
|
||||||
labels:
|
labels:
|
||||||
homepage.group: Downloaders
|
homepage.group: Downloaders
|
||||||
homepage.name: qBittorrent
|
homepage.name: qBittorrent
|
||||||
@@ -5381,7 +5380,7 @@ services:
|
|||||||
VPN_USER: ${SABNZBDVPN_ENVIRONMENT_VPN_USER}
|
VPN_USER: ${SABNZBDVPN_ENVIRONMENT_VPN_USER}
|
||||||
DEBUG: true
|
DEBUG: true
|
||||||
hostname: Rinoa
|
hostname: Rinoa
|
||||||
image: ghcr.io/binhex/arch-sabnzbdvpn:latest@sha256:f9c6e4131a003ff8d033949afa08e3555cddcccbff51375c920f3755438e2b06
|
image: ghcr.io/binhex/arch-sabnzbdvpn:latest@sha256:c01bec2f4a9695aca83034f2ca759936ac1d2ddd96b2dc17ce62533bb065ea84
|
||||||
labels:
|
labels:
|
||||||
homepage.group: Downloaders
|
homepage.group: Downloaders
|
||||||
homepage.name: SABnzbd
|
homepage.name: SABnzbd
|
||||||
@@ -5430,8 +5429,6 @@ services:
|
|||||||
source: /rinoa-storage
|
source: /rinoa-storage
|
||||||
target: /storage
|
target: /storage
|
||||||
type: bind
|
type: bind
|
||||||
- ${DOCKER_VOLUME_CONFIG}/.openvpn:/config/openvpn
|
|
||||||
- ${DOCKER_VOLUME_CONFIG}/.wireguard:/config/wireguard
|
|
||||||
sablier:
|
sablier:
|
||||||
container_name: sablier
|
container_name: sablier
|
||||||
environment:
|
environment:
|
||||||
@@ -6107,7 +6104,7 @@ services:
|
|||||||
SECURITY_ENABLE_LOGIN: true
|
SECURITY_ENABLE_LOGIN: true
|
||||||
SYSTEM_SHOW_UPDATE: false
|
SYSTEM_SHOW_UPDATE: false
|
||||||
SYSTEM_SHOW_UPDATE_ONLY_ADMIN: true
|
SYSTEM_SHOW_UPDATE_ONLY_ADMIN: true
|
||||||
image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest@sha256:976dfa581b6cb1fb91e9b0b90284a92febe8ba6a4519e28f95c4e8e550d6d70d
|
image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest@sha256:950c596db26e0764f642def2fd4f9ee904ff2ac16d83fe621ff731b771d9b385
|
||||||
labels:
|
labels:
|
||||||
homepage.name: Stirling-PDF
|
homepage.name: Stirling-PDF
|
||||||
homepage.group: Professional Services
|
homepage.group: Professional Services
|
||||||
@@ -6159,7 +6156,7 @@ services:
|
|||||||
UPTIME_KUMA_URL: http://uptimekuma:3001
|
UPTIME_KUMA_URL: http://uptimekuma:3001
|
||||||
UPTIME_KUMA_USERNAME: ${UPTIME_KUMA_USERNAME}
|
UPTIME_KUMA_USERNAME: ${UPTIME_KUMA_USERNAME}
|
||||||
hostname: Rinoa
|
hostname: Rinoa
|
||||||
image: lscr.io/linuxserver/swag:latest@sha256:ef97e83fc0283f972406ed62f208482653b9a9233eb389b947718b28c8c99263
|
image: lscr.io/linuxserver/swag:latest@sha256:74b906a164b2eb43f1792aeac5e2ca464b5b118b3d918cb1a5f2b8ccfed12ebb
|
||||||
labels:
|
labels:
|
||||||
swag: enable
|
swag: enable
|
||||||
swag_proto: http
|
swag_proto: http
|
||||||
@@ -6456,26 +6453,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/config/:/vault/config
|
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/config/:/vault/config
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/logs/:/vault/logs
|
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/logs/:/vault/logs
|
||||||
vault-agent:
|
|
||||||
cap_add:
|
|
||||||
- IPC_LOCK
|
|
||||||
command:
|
|
||||||
- agent
|
|
||||||
- -config=/vault/config/vault-agent.hcl
|
|
||||||
container_name: hc-vault-agent
|
|
||||||
environment:
|
|
||||||
VAULT_ADDR: http://hc-vault:8200
|
|
||||||
SKIP_SETCAP: true
|
|
||||||
image: hashicorp/vault:2.0.0-bugfix
|
|
||||||
ports:
|
|
||||||
- 8100
|
|
||||||
profiles: ["rinoa-apps"]
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/agent/config/:/vault/config:ro
|
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/agent/data/:/vault/data:ro
|
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/agent/tokens/:/vault/tokens
|
|
||||||
- ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/agent/output/:/vault/output
|
|
||||||
wallos:
|
wallos:
|
||||||
container_name: wallos
|
container_name: wallos
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
Reference in New Issue
Block a user