Merge remote-tracking branch 'origin/v4-stable' into v4-beta

This commit is contained in:
Aaron Dewes 2022-10-25 12:25:14 +02:00
commit 39e9224a86
4 changed files with 22 additions and 20 deletions

View File

@ -2,7 +2,7 @@ version: 3
metadata: metadata:
category: Files category: Files
name: Nextcloud name: Nextcloud
version: 24.0.6 version: 25.0.0
tagline: Your personal cloud tagline: Your personal cloud
description: No description yet. description: No description yet.
developers: developers:
@ -24,9 +24,9 @@ containers:
- data/db:/var/lib/mysql - data/db:/var/lib/mysql
environment: environment:
MARIADB_ROOT_PASSWORD: password123 MARIADB_ROOT_PASSWORD: password123
MARIADB_DATABASE: nextcloud
MARIADB_USER: nextcloud MARIADB_USER: nextcloud
MARIADB_PASSWORD: password123 MARIADB_PASSWORD: password123
MARIADB_DATABASE: nextcloud
user: 1000:1000 user: 1000:1000
- name: redis - name: redis
image: redis:6.2.6-bullseye@sha256:0c0484b1d1ff36faace984fe9d8e0fe58892ecc34a4859b97171045b9cd343e1 image: redis:6.2.6-bullseye@sha256:0c0484b1d1ff36faace984fe9d8e0fe58892ecc34a4859b97171045b9cd343e1
@ -34,21 +34,21 @@ containers:
- data/redis:/data - data/redis:/data
user: 1000:1000 user: 1000:1000
- name: web - name: web
image: nextcloud:24.0.6@sha256:14632f0ac1b5081f4df50ec97eefc610e0eb22019589b638e605e3c4e76ec1a5 image: nextcloud:25.0.0@sha256:673d2ec801f2aaa953c4587db5a9bd53430497c95d9d439819074f3ef05538ac
data: data:
- data/nextcloud:/var/www/html - data/nextcloud:/var/www/html
depends_on: depends_on:
- db - db
- redis - redis
environment: environment:
NEXTCLOUD_ADMIN_USER: citadel
NEXTCLOUD_TRUSTED_DOMAINS: ${APP_DOMAIN}:${APP_NEXTCLOUD_WEB_PORT} ${APP_HIDDEN_SERVICE}
MYSQL_DATABASE: nextcloud
REDIS_HOST: ${APP_NEXTCLOUD_REDIS_IP} REDIS_HOST: ${APP_NEXTCLOUD_REDIS_IP}
MYSQL_USER: nextcloud MYSQL_USER: nextcloud
NEXTCLOUD_ADMIN_PASSWORD: $APP_SEED NEXTCLOUD_ADMIN_PASSWORD: $APP_SEED
MYSQL_HOST: ${APP_NEXTCLOUD_DB_IP} MYSQL_DATABASE: nextcloud
NEXTCLOUD_TRUSTED_DOMAINS: ${APP_DOMAIN}:${APP_NEXTCLOUD_WEB_PORT} ${APP_HIDDEN_SERVICE}
MYSQL_PASSWORD: password123 MYSQL_PASSWORD: password123
NEXTCLOUD_ADMIN_USER: citadel
MYSQL_HOST: ${APP_NEXTCLOUD_DB_IP}
port: 80 port: 80
- name: cron - name: cron
image: nextcloud:24.0.4@sha256:69a52f571dc72f9ebbe222fc810f09d016173ec94f4423ea5e3d628496c1a5d5 image: nextcloud:24.0.4@sha256:69a52f571dc72f9ebbe222fc810f09d016173ec94f4423ea5e3d628496c1a5d5

View File

@ -2,7 +2,7 @@ version: 3
metadata: metadata:
category: Wallets category: Wallets
name: Specter Desktop name: Specter Desktop
version: 1.13.0 version: 1.13.1
tagline: Multisig with hardware wallets made easy tagline: Multisig with hardware wallets made easy
description: |- description: |-
Specter Desktop connects to the Bitcoin Core running on your Citadel and functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets. At the moment Specter Desktop is working with all major hardware wallets including: Specter Desktop connects to the Bitcoin Core running on your Citadel and functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets. At the moment Specter Desktop is working with all major hardware wallets including:
@ -29,16 +29,16 @@ metadata:
- 3.jpg - 3.jpg
containers: containers:
- name: web - name: web
image: lncm/specter-desktop:v1.13.0@sha256:4e140c455fb3b421c0143794ca584f0b6fd8f0eec0dadcf0aeb164176c1e39dd image: lncm/specter-desktop:v1.13.1@sha256:d277dec2a54fc77f3ccbc0f082183abce31e655b50f21da8d098f90fb734a15b
command: command:
- --host=0.0.0.0 - --host=0.0.0.0
- --specter-data-folder=/data - --specter-data-folder=/data
data: data:
- data:/data - data:/data
environment: environment:
BTC_RPC_HOST: $BITCOIN_IP
BTC_RPC_PASSWORD: $BITCOIN_RPC_PASS BTC_RPC_PASSWORD: $BITCOIN_RPC_PASS
BTC_RPC_USER: $BITCOIN_RPC_USER BTC_RPC_USER: $BITCOIN_RPC_USER
BTC_RPC_HOST: $BITCOIN_IP
BTC_RPC_PORT: $BITCOIN_RPC_PORT BTC_RPC_PORT: $BITCOIN_RPC_PORT
BTC_RPC_PROTOCOL: http BTC_RPC_PROTOCOL: http
mounts: mounts:

View File

@ -1,7 +1,7 @@
citadel_version: 4 citadel_version: 4
metadata: metadata:
name: Synapse name: Synapse
version: 1.68.0 version: 1.69.0
category: Social category: Social
tagline: Matrix homeserver tagline: Matrix homeserver
developers: developers:
@ -17,19 +17,20 @@ metadata:
- 3.jpg - 3.jpg
defaultPassword: null defaultPassword: null
torOnly: false torOnly: false
compatible: false
services: services:
server: server:
image: ghcr.io/runcitadel/synapse:develop@sha256:80e15d6247e30d162758178aeb41bb9181e5d7ec9d73af35939bccbb3aecbab9 image: ghcr.io/runcitadel/synapse:develop@sha256:80e15d6247e30d162758178aeb41bb9181e5d7ec9d73af35939bccbb3aecbab9
entrypoint: bash entrypoint: bash
command: -c './start.py generate && ./start.py migrate_config && exec ./start.py' command: -c './start.py generate && ./start.py migrate_config && exec ./start.py'
environment: environment:
SYNAPSE_REPORT_STATS: yes
SYNAPSE_HTTP_PORT: 8008
GID: '1000' GID: '1000'
SYNAPSE_NO_TLS: yes SYNAPSE_NO_TLS: yes
UID: '1000'
SYNAPSE_SERVER_NAME: ${APP_HIDDEN_SERVICE}
SYNAPSE_REPORT_STATS: yes
SYNAPSE_ENABLE_REGISTRATION: yes SYNAPSE_ENABLE_REGISTRATION: yes
SYNAPSE_HTTP_PORT: 8008 SYNAPSE_SERVER_NAME: ${APP_HIDDEN_SERVICE}
UID: '1000'
port: 8008 port: 8008
mounts: mounts:
data: data:

View File

@ -1,7 +1,7 @@
citadel_version: 4 citadel_version: 4
metadata: metadata:
name: WordPress name: WordPress
version: 6.0.2 version: 6.0.3
category: Blog category: Blog
tagline: Host a blog on your Citadel tagline: Host a blog on your Citadel
developers: developers:
@ -18,29 +18,30 @@ metadata:
- 3.png - 3.png
defaultPassword: null defaultPassword: null
torOnly: false torOnly: false
compatible: false
services: services:
main: main:
image: wordpress:6.0.2@sha256:3dff5e9e1497b522b48dd8a0fcf50dfbbb925f1487c6db581c28e73fdbfc49c1 image: wordpress:6.0.3@sha256:4a545ef322a1c9cbd5582339f4d57ad09761243353699a62f43d0dd6fcf534ac
depends_on: depends_on:
- db - db
restart: always restart: always
environment: environment:
WORDPRESS_CONFIG_EXTRA: | WORDPRESS_CONFIG_EXTRA: |
define('FS_METHOD','direct'); define('FS_METHOD','direct');
WORDPRESS_DB_HOST: $APP_WORDPRESS_DB_IP
WORDPRESS_DB_USER: root WORDPRESS_DB_USER: root
WORDPRESS_DB_PASSWORD: somewordpress WORDPRESS_DB_PASSWORD: somewordpress
WORDPRESS_DB_NAME: wordpress WORDPRESS_DB_NAME: wordpress
WORDPRESS_DB_HOST: $APP_WORDPRESS_DB_IP
port: 80 port: 80
db: db:
image: mariadb:10.7.3-focal@sha256:07e06f2e7ae9dfc63707a83130a62e00167c827f08fcac7a9aa33f4b6dc34e0e image: mariadb:10.7.3-focal@sha256:07e06f2e7ae9dfc63707a83130a62e00167c827f08fcac7a9aa33f4b6dc34e0e
user: 1000:1000 user: 1000:1000
restart: always restart: always
environment: environment:
MARIADB_PASSWORD: wordpress
MARIADB_DATABASE: wordpress
MARIADB_USER: wordpress MARIADB_USER: wordpress
MARIADB_ROOT_PASSWORD: somewordpress MARIADB_ROOT_PASSWORD: somewordpress
MARIADB_DATABASE: wordpress
MARIADB_PASSWORD: wordpress
mounts: mounts:
data: data:
data/db: /var/lib/mysql data/db: /var/lib/mysql