summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml4
-rw-r--r--mastodon.castle.yml16
2 files changed, 16 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index e13ac95..c8cbf93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ name: sandcastles
services:
root-ca:
+ container_name: root_ca.castle
image: smallstep/step-ca:0.25.0
volumes:
- './volumes/root-ca:/home/step'
@@ -19,9 +20,10 @@ services:
- root-ca.castle
proxy:
+ container_name: dashboard.castle
labels:
- traefik.enable=false
- image: traefik-trust-sandcastle-ca
+ image: traefik-sandcastle
build:
dockerfile: proxy.Dockerfile
volumes:
diff --git a/mastodon.castle.yml b/mastodon.castle.yml
index 4b1cc92..780edcf 100644
--- a/mastodon.castle.yml
+++ b/mastodon.castle.yml
@@ -1,6 +1,18 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+# Configuration adapted from
+# https://github.com/bitnami/containers/blob/main/bitnami/mastodon/docker-compose.yml
+
+# must be used as an overlay for the main docker-compose file. Ex
+# docker-compose -f docker-compose.yml -f mastodon.castle.yml up
+
+# defaults
+# admin: user@bitnami.org
+# password: bitnami1
services:
mastodon:
+ container_name: mastodon.castle
labels:
- traefik.http.routers.mastodon.rule=Host(`mastodon.castle`)
- traefik.http.routers.mastodon.tls=true
@@ -10,13 +22,11 @@ services:
- mastodon_db
- mastodon_es
- mastodon_redis
- image: mastodon-trust-sandcastle-ca
+ image: mastodon-sandcastle
build:
dockerfile: mastodon.Dockerfile
volumes:
- 'mastodon_data:/bitnami/mastodon'
- ports:
- - '3080:3000'
networks:
- mastodon
- fediverse