Merge branch 'next' into fix-pgadmin-docker-network

This commit is contained in:
Andras Bacsai 2025-10-13 14:16:27 +02:00 committed by GitHub
commit 473fe6ffa3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 5209 additions and 8072 deletions

12958
CHANGELOG.md

File diff suppressed because it is too large Load diff

154
public/svgs/gramps-web.svg Normal file
View file

@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg602"
sodipodi:version="0.34"
width="500pt"
height="500pt"
xml:space="preserve"
sodipodi:docname="logo.svg"
version="1.1"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
id="metadata90"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs604"><linearGradient
id="linearGradient627"><stop
style="stop-color:#7f7f7f;stop-opacity:1;"
offset="0"
id="stop628" /><stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop629" /></linearGradient><linearGradient
xlink:href="#linearGradient627"
id="linearGradient630" /><radialGradient
xlink:href="#linearGradient627"
id="radialGradient631"
cx="0.4920629"
cy="0.48437563"
r="0.7127381"
fx="0.4920629"
fy="0.48437563" /><radialGradient
xlink:href="#linearGradient627"
id="radialGradient634"
cx="0.5"
cy="0.5"
r="0.5"
fx="0.5"
fy="0.5" /><radialGradient
xlink:href="#linearGradient627"
id="radialGradient637"
cx="0.49542692"
cy="0.53518981"
r="0.55758011"
fx="0.49542692"
fy="0.53518981"
gradientTransform="scale(1.038947,0.962513)"
gradientUnits="objectBoundingBox" /></defs><sodipodi:namedview
id="base"
showgrid="false"
inkscape:zoom="0.73361291"
inkscape:cx="456.94095"
inkscape:cy="277.6002"
inkscape:window-width="1920"
inkscape:window-height="1003"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g1176"
inkscape:snap-bbox="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:bbox-paths="true"
inkscape:object-paths="true"
inkscape:document-rotation="0" /><g
id="g1176"
transform="translate(1.111852,-1.9505107)"><path
inkscape:connector-curvature="0"
id="path1087"
d="m 175.2367,338.27684 h 31.47905 v -153.9548 h 60.76188"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="298.72879"
x="53.249031"
height="77.683617"
width="114.48766"
id="rect1025"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="145.48022"
x="260.97763"
height="77.683617"
width="114.48766"
id="rect1025-3"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="66.233986"
x="496.70627"
height="77.683617"
width="114.48766"
id="rect1025-3-7"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="216.99173"
x="496.70627"
height="77.683617"
width="114.48766"
id="rect1025-3-6-5"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
inkscape:connector-curvature="0"
id="path1087-3"
d="m 175.2367,338.27684 h 31.47905 v 153.9548 h 60.76188"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="453.3432"
x="260.97763"
height="77.683617"
width="114.48766"
id="rect1025-3-5"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
inkscape:connector-curvature="0"
id="path1087-6"
d="m 389.46529,181.9825 h 36.59813 v -76.10121 h 70.64286"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><path
inkscape:connector-curvature="0"
id="path1087-3-2"
d="m 375.46529,181.9825 50.59813,0 v 76.1012 h 70.64286"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
sodipodi:nodetypes="cccc" /><rect
ry="13.418079"
rx="13.418079"
y="375.8923"
x="496.70627"
height="77.683617"
width="114.48766"
id="rect1025-3-7-9"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
ry="13.418079"
rx="13.418079"
y="526.65009"
x="496.70627"
height="77.683617"
width="114.48766"
id="rect1025-3-6-5-1"
style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
inkscape:connector-curvature="0"
id="path1087-6-2"
d="m 389.46529,491.64082 h 36.59813 v -76.10121 h 70.64286"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><path
inkscape:connector-curvature="0"
id="path1087-3-2-7"
d="m 375.46529,491.64082 50.59813,0 v 76.10121 h 70.64286"
style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
sodipodi:nodetypes="cccc" /></g></svg>

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 KiB

View file

@ -1,4 +1,4 @@
# documentation: https://docs.convex.dev/
# documentation: https://github.com/get-convex/convex-backend/blob/main/self-hosted/README.md
# slogan: Convex is the open-source reactive database for app developers.
# category: backend
# tags: database, reactive, database, ai, agents, chatbot, api, team, bot, flows
@ -7,7 +7,7 @@
services:
backend:
image: ghcr.io/get-convex/convex-backend:5143fec81f146ca67495c12c6b7a15c5802c37e2
image: ghcr.io/get-convex/convex-backend:00bd92723422f3bff968230c94ccdeb8c1719832
volumes:
- data:/convex/data
environment:
@ -16,22 +16,42 @@ services:
- INSTANCE_SECRET=${SERVICE_HEX_32_SECRET}
- CONVEX_RELEASE_VERSION_DEV=${CONVEX_RELEASE_VERSION_DEV:-}
- ACTIONS_USER_TIMEOUT_SECS=${ACTIONS_USER_TIMEOUT_SECS:-}
- CONVEX_CLOUD_ORIGIN=${SERVICE_URL_CONVEX_3210}
- CONVEX_SITE_ORIGIN=${SERVICE_URL_CONVEX_3211}
# URL of the Convex API as accessed by the client/frontend.
- CONVEX_CLOUD_ORIGIN=${SERVICE_URL_CONVEX}
# URL of Convex HTTP actions as accessed by the client/frontend.
- CONVEX_SITE_ORIGIN=${SERVICE_URL_BACKEND}
- DATABASE_URL=${DATABASE_URL:-}
- DISABLE_BEACON=${DISABLE_BEACON:-}
- REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:-}
- CONVEX_SELF_HOSTED_URL=${SERVICE_URL_CONVEX_6791}
- DISABLE_BEACON=${DISABLE_BEACON:?false}
- REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:?false}
- DO_NOT_REQUIRE_SSL=${DO_NOT_REQUIRE_SSL:?true}
- POSTGRES_URL=${POSTGRES_URL:-}
- MYSQL_URL=${MYSQL_URL:-}
- RUST_LOG=${RUST_LOG:-info}
- RUST_BACKTRACE=${RUST_BACKTRACE:-}
- AWS_REGION=${AWS_REGION:-}
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}
- AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN:-}
- AWS_S3_FORCE_PATH_STYLE=${AWS_S3_FORCE_PATH_STYLE:-}
- AWS_S3_DISABLE_SSE=${AWS_S3_DISABLE_SSE:-}
- AWS_S3_DISABLE_CHECKSUMS=${AWS_S3_DISABLE_CHECKSUMS:-}
- S3_STORAGE_EXPORTS_BUCKET=${S3_STORAGE_EXPORTS_BUCKET:-}
- S3_STORAGE_SNAPSHOT_IMPORTS_BUCKET=${S3_STORAGE_SNAPSHOT_IMPORTS_BUCKET:-}
- S3_STORAGE_MODULES_BUCKET=${S3_STORAGE_MODULES_BUCKET:-}
- S3_STORAGE_FILES_BUCKET=${S3_STORAGE_FILES_BUCKET:-}
- S3_STORAGE_SEARCH_BUCKET=${S3_STORAGE_SEARCH_BUCKET:-}
- S3_ENDPOINT_URL=${S3_ENDPOINT_URL:-}
healthcheck:
test: curl -f http://127.0.0.1:3210/version
interval: 5s
start_period: 5s
start_period: 10s
dashboard:
image: ghcr.io/get-convex/convex-dashboard:5143fec81f146ca67495c12c6b7a15c5802c37e2
image: ghcr.io/get-convex/convex-dashboard:33cef775a8a6228cbacee4a09ac2c4073d62ed13
environment:
- SERVICE_URL_CONVEX_6791
- NEXT_PUBLIC_DEPLOYMENT_URL=$SERVICE_URL_BACKEND_3210
# URL of the Convex API as accessed by the dashboard (browser).
- NEXT_PUBLIC_DEPLOYMENT_URL=${SERVICE_URL_BACKEND}
depends_on:
backend:
condition: service_healthy

View file

@ -29,8 +29,3 @@ services:
"address": "0.0.0.0",
"port": 80
}
healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
interval: 2s
timeout: 10s
retries: 15

View file

@ -0,0 +1,59 @@
# documentation: https://www.grampsweb.org/install_setup/setup/
# slogan: Open Source Online Genealogy System.
# category: family
# tags: family, genealogy, personal
# logo: svgs/gramps-web.svg
# port: 5000
services:
grampsweb:
image: ghcr.io/gramps-project/grampsweb:25.9.0
environment:
- SERVICE_URL_GRAMPSWEB_5000
- GRAMPSWEB_TREE=${GRAMPSWEB_TREE:-Gramps Web} # will create a new tree if not exists
- GRAMPSWEB_CELERY_CONFIG__broker_url=redis://grampsweb_redis:6379/0
- GRAMPSWEB_CELERY_CONFIG__result_backend=redis://grampsweb_redis:6379/0
- GRAMPSWEB_RATELIMIT_STORAGE_URI=redis://grampsweb_redis:6379/1
- GUNICORN_NUM_WORKERS=${GUNICORN_NUM_WORKERS:-2}
depends_on:
- grampsweb_redis
volumes: &volumes
- gramps_users:/app/users # persist user database
- gramps_index:/app/indexdir # persist search index
- gramps_thumb_cache:/app/thumbnail_cache # persist thumbnails
- gramps_cache:/app/cache # persist export and report caches
- gramps_secret:/app/secret # persist flask secret
- gramps_db:/root/.gramps/grampsdb # persist Gramps database
- gramps_media:/app/media # persist media files
- gramps_tmp:/tmp
healthcheck:
test: wget -O - http://localhost:5000 > /dev/null 2>&1
interval: 5s
timeout: 10s
retries: 3
grampsweb_celery:
image: ghcr.io/gramps-project/grampsweb:25.9.0
environment:
- GRAMPSWEB_TREE=${GRAMPSWEB_TREE:-Gramps Web} # will create a new tree if not exists
- GRAMPSWEB_CELERY_CONFIG__broker_url=redis://grampsweb_redis:6379/0
- GRAMPSWEB_CELERY_CONFIG__result_backend=redis://grampsweb_redis:6379/0
- GRAMPSWEB_RATELIMIT_STORAGE_URI=redis://grampsweb_redis:6379/1
depends_on:
- grampsweb_redis
volumes:
<<: *volumes
command: celery -A gramps_webapi.celery worker --loglevel=INFO --concurrency=2
healthcheck:
test: SECRET_KEY="$(cat secret/secret)" celery -A gramps_webapi.celery status || exit 1
interval: 5s
timeout: 10s
retries: 3
grampsweb_redis:
image: docker.io/library/redis:7.2.4-alpine
healthcheck:
test: redis-cli ping | grep PONG
interval: 5s
timeout: 10s
retries: 3

View file

@ -10,12 +10,12 @@ services:
image: mattermost/mattermost-team-edition:release-10
platform: linux/amd64
volumes:
- 'mattermost-data-config:/mattermost/config:rw'
- 'mattermost-data-data:/mattermost/data:rw'
- 'mattermost-data-logs:/mattermost/logs:rw'
- 'mattermost-data-plugins:/mattermost/plugins:rw'
- 'mattermost-data-client-plugins:/mattermost/client/plugins:rw'
- 'mattermost-data-bleve-indexes:/mattermost/bleve-indexes:rw'
- "mattermost-data-config:/mattermost/config:rw"
- "mattermost-data-data:/mattermost/data:rw"
- "mattermost-data-logs:/mattermost/logs:rw"
- "mattermost-data-plugins:/mattermost/plugins:rw"
- "mattermost-data-client-plugins:/mattermost/client/plugins:rw"
- "mattermost-data-bleve-indexes:/mattermost/bleve-indexes:rw"
environment:
- SERVICE_URL_MATTERMOST_8065
- MM_SERVICESETTINGS_SITEURL=${SERVICE_URL_MATTERMOST}
@ -26,11 +26,6 @@ services:
depends_on:
postgres:
condition: service_healthy
healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1:8065"]
interval: 5s
timeout: 20s
retries: 10
postgres:
image: postgres:16-alpine

View file

@ -0,0 +1,27 @@
# documentation: https://github.com/basecamp/once-campfire
# slogan: Super simple group chat, without a subscription.
# category: messaging
# tags: campfire,chat,communication,rails,once,basecamp,37signals
# logo: svgs/once-campfire.png
# port: 80
services:
campfire:
image: ghcr.io/basecamp/once-campfire:${TAG:-main}
restart: unless-stopped
volumes:
- campfire-storage:/rails/storage
environment:
- SERVICE_URL_CAMPFIRE_80
- SECRET_KEY_BASE=${SERVICE_BASE64_64_CAMPFIRE} # required, set this to a secure random value
- VAPID_PUBLIC_KEY=${VAPID_PUBLIC_KEY} # optional, for notifications
- VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY} # optional, for notifications
- DISABLE_SSL=${DISABLE_SSL:-true} # optional, disable SSL
- SSL_DOMAIN=${SSL_DOMAIN:-false} # optional, for SSL
- SKIP_TELEMETRY=${SKIP_TELEMETRY:-true} # optional, set to disable telemetry
- SENTRY_DSN=${SENTRY_DSN} # optional, for error reporting
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/up"]
interval: 10s
timeout: 5s
retries: 5

View file

@ -0,0 +1,21 @@
# documentation: https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html
# slogan: pgAdmin is a web-based database management tool for administering your PostgreSQL databases through a user-friendly interface.
# category: database
# tags: database management
# logo: svgs/postgresql.svg
# port: 80
services:
pgadmin:
image: 'dpage/pgadmin4:latest'
environment:
- SERVICE_URL_PGADMIN
- 'PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:?}'
- 'PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:?}'
volumes:
- pgadmin-data:/var/lib/pgadmin
healthcheck:
test: ["CMD", "wget", "-qO-", "http://localhost:80/login"]
interval: 5s
timeout: 10s
retries: 5