54 Commits

Author SHA1 Message Date
5b2d3845db Pass through AWS_SECRET_ACCESS_KEY
Some checks failed
continuous-integration/drone/pr Build is failing
2026-01-07 23:05:38 +00:00
9d5927f60a Merge pull request 'Move elasticsearch into separate compose file' (#33) from change/es-compose into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #33
Reviewed-by: ammaratef45 <ammaratef45@proton.me>
2026-01-04 22:18:59 +00:00
faf931a91a Set ES_* vars to fixed values
Some checks failed
continuous-integration/drone/pr Build is failing
2026-01-04 11:09:41 +00:00
f4f105aea6 Remove elasticsearch from compose.yml 2026-01-04 10:58:29 +00:00
a8cf0fd940 Move elasticsearch into separate compose file
Some checks failed
continuous-integration/drone/pr Build is failing
2026-01-03 11:04:09 +00:00
7f1ba44869 Merge pull request 'Add s3 configuration options' (#32) from add/s3 into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #32
2026-01-02 21:55:27 +00:00
0004866d6b Add s3 configuration options
Some checks failed
continuous-integration/drone/pr Build is failing
2025-12-28 18:31:35 +00:00
3wc
849d8ba9a7 chore: publish 2.1.3+v4.5.3 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-12-09 13:21:43 -05:00
3wc
7846559007 chore: publish 2.1.2+v4.5.2 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-12-09 13:20:14 -05:00
53ea5afb5b Merge pull request 'chore: add benjaminlj as maintainer' (#27) from benjaminlyng/mastodon:chore/add_maintainer into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #27
2025-11-18 20:45:35 +00:00
f24aa11ddc chore: add benjaminlj as maintainer
Some checks failed
continuous-integration/drone/pr Build is failing
2025-11-18 20:16:05 +01:00
3wc
d9de83eb06 chore: publish 2.1.1+v4.5.1 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-11-15 21:05:44 -05:00
3wc
f0d07bcd71 chore: publish 2.1.0+v4.5.0 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-11-15 20:47:22 -05:00
3wc
3bb4274ae4 chore: publish 2.0.1+v4.4.8 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-10-21 13:42:57 -04:00
683fb2d24d Merge pull request 'chore(deps): update tootsuite/mastodon docker tag to v4.4.8' (#24) from renovate/tootsuite-mastodon-4.x into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #24
2025-10-21 17:36:54 +00:00
38cffa745a Merge pull request 'chore(deps): update tootsuite/mastodon-streaming docker tag to v4.4.8' (#23) from renovate/tootsuite-mastodon-streaming-4.x into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #23
2025-10-21 17:36:46 +00:00
3a5d28394f chore(deps): update tootsuite/mastodon docker tag to v4.4.8
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-21 14:35:20 +00:00
2a36d928d9 chore(deps): update tootsuite/mastodon-streaming docker tag to v4.4.8
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-21 14:05:23 +00:00
3wc
23a71ea65b docs: Add maintainance info
[ci skip]
2025-10-19 12:56:50 -04:00
3wc
a6749ed224 chore: publish 2.0.0+v4.4.7 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-10-19 11:37:28 -04:00
3b51e3c602 Merge pull request 'chore(deps): update tootsuite/mastodon-streaming docker tag to v4.4.7' (#20) from renovate/tootsuite-mastodon-streaming-4.x into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #20
2025-10-19 15:33:16 +00:00
99a3c12d2d chore(deps): update tootsuite/mastodon-streaming docker tag to v4.4.7
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-19 15:33:04 +00:00
408d3d7d70 Merge pull request 'chore(deps): update tootsuite/mastodon docker tag to v4.4.7' (#19) from renovate/tootsuite-mastodon-4.x into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #19
2025-10-19 15:32:54 +00:00
3d27b65c84 chore(deps): update tootsuite/mastodon docker tag to v4.4.7
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-19 15:32:45 +00:00
3wc
e1d47b1b88 fix: Switch docker volume path for postgres 18+
Some checks failed
continuous-integration/drone/push Build is failing
2025-10-19 10:47:57 -04:00
3wc
5f6028ef17 Upgrade postgres to 18 2025-10-18 18:24:51 -04:00
3wc
1c98e0d790 chore: Switch to pgautoupgrade image
Some checks failed
continuous-integration/drone/push Build is failing
2025-10-18 18:09:36 -04:00
d7086e8b4a Merge pull request 'chore: Configure Renovate' (#18) from renovate/configure into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #18
2025-10-18 20:30:03 +00:00
3ac2b9a2a3 Add renovate.json
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-18 20:25:19 +00:00
3wc
69b6d7f664 chore: publish 1.3.0+v4.4.4 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-09-16 10:16:32 -04:00
3wc
66aa71c4e1 chore: publish 1.2.0+v4.4.3 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2025-08-06 12:54:01 +01:00
3wc
0a0273306e Minor fixes to MAX_CHARS command:
Some checks failed
continuous-integration/drone/push Build is failing
2025-07-27 15:58:01 +01:00
52a0626ec8 Merge pull request 'remove old setup script' (#17) from benjaminlyng/mastodon:chore/remove_old_setup_script into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #17
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
2025-06-09 10:31:07 +00:00
c05f3c615a remove old setup script
Some checks failed
continuous-integration/drone/pr Build is failing
2025-06-09 06:18:34 +02:00
3wc
c2df07e146 chore: publish 1.1.0+v4.3.8 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-06-07 19:08:19 +01:00
3wc
f40559dcf0 Run rake db:migrate during startup
Some checks failed
continuous-integration/drone/push Build is failing
Fixes #15
2025-06-07 19:04:19 +01:00
3wc
ba632b7d61 Also approve accounts when creating with admin() 2025-06-07 19:01:03 +01:00
3wc
d79abf04ad Add MAX_CHARS 🎉 2025-06-07 19:00:40 +01:00
3wc
72f3ac9af4 Fix admin account creation instructions
Some checks failed
continuous-integration/drone/push Build is failing
2025-05-27 19:09:59 +02:00
3wc
6b6fc44d33 Update MASTO_VERSION in abra.sh 2025-05-27 18:53:43 +02:00
3wc
b23d6f874e chore: publish 1.0.5+v4.3.8 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-05-08 13:05:26 +02:00
3wc
f2c781b20c chore: publish 1.0.4+v4.3.7 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-05-05 13:14:10 +02:00
bc57af62d4 Merge pull request 'add command to generate activerecord secrets' (#16) from benjaminlyng/mastodon:docs/add_generate_secrets_command into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #16
Reviewed-by: ammaratef45 <ammaratef45@proton.me>
2025-04-20 05:44:00 +00:00
1547cddb7c add command to generate activerecord secrets
Some checks failed
continuous-integration/drone/pr Build is failing
2025-04-19 06:37:20 +02:00
3wc
7bb4a5d2e4 chore: publish 1.0.3+v4.3.6 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2025-03-31 18:02:17 +01:00
3wc
adc02f9cac chore: publish 1.0.2+v4.3.3 release
All checks were successful
continuous-integration/drone/tag Build is passing
2025-01-16 08:20:47 -05:00
4b8a571128 Update .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2025-01-08 10:09:13 -08:00
3wc
c498ba28cb chore: publish 1.0.1+v4.3.2 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-12-27 04:46:50 -05:00
a919e1553b replace ACTIVE_RECORD_ENCRYPTION with ARE to shorten secret name
Some checks failed
continuous-integration/drone/push Build is failing
2024-11-22 18:39:44 -08:00
74109d293b use rails instead of rake
Some checks failed
continuous-integration/drone/push Build is failing
2024-11-22 18:09:51 -08:00
8b860ead6c look for ggrep if grep version is BSD 2024-11-22 17:58:52 -08:00
3wc
a61097df85 chore: publish 1.0.0+v4.3.1 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-11-21 22:45:58 -05:00
3wc
95f295ed5c OIDC secret storage, separate streaming entrypoint 2024-11-21 22:44:45 -05:00
3wc
f70ec17004 chore: publish 0.3.0+v4.2.13 release
Some checks failed
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2024-11-20 11:14:40 -05:00
15 changed files with 348 additions and 63 deletions

View File

@ -38,7 +38,7 @@ steps:
from_secret: drone_abra-bot_token
fork: true
repositories:
- coop-cloud/auto-recipes-catalogue-json
- toolshed/auto-recipes-catalogue-json
trigger:
event: tag

View File

@ -15,6 +15,10 @@ LETS_ENCRYPT_ENV=production
COMPOSE_FILE="compose.yml"
# Set the maximum length for toots (posts). Longer posts from other servers will still be displayed, this limit only applies to users on this instance.
#MAX_CHARS=500
#COMPOSE_FILE="$COMPOSE_FILE:compose.character-limit.yml"
# Federation
# ----------
# DO NOT CHANGE DOMAIN VARIABLES AFTER DEPLOYMENT! WILL BREAK FEDERATION!!
@ -63,9 +67,7 @@ REDIS_PORT=6379
# ElasticSearch
# --------------------------------------
ES_ENABLED=true
ES_HOST=es
ES_PORT=9200
# COMPOSE_FILE="$COMPOSE_FILE:compose.elasticsearch.yml"
# StatsD (CURRENTLY NOT SUPPORTED)
# -------------------------------
@ -79,6 +81,10 @@ SECRET_OTP_SECRET_VERSION=v1
SECRET_VAPID_PRIVATE_KEY_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1
SECRET_SMTP_PASSWORD_VERSION=v1
SECRET_ARE_DETERMINISTIC_KEY_VERSION=v1
SECRET_ARE_KEY_DERIVATION_SALT_VERSION=v1
SECRET_ARE_PRIMARY_KEY_VERSION=v1
SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
# Web Push
# ========
@ -119,10 +125,9 @@ DEFAULT_LOCALE=en
# S3 and AWS
# ----------
# S3_ENABLED=
# S3_BUCKET=
# COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
# AWS_ACCESS_KEY_ID=
# AWS_SECRET_ACCESS_KEY=
# S3_BUCKET=
# S3_REGION=
# S3_PROTOCOL=
# S3_HOSTNAME=
@ -131,6 +136,15 @@ DEFAULT_LOCALE=en
# S3_OVERRIDE_PATH_STYLE=
# S3_OPEN_TIMEOUT=
# S3_READ_TIMEOUT=
# S3_RETRY_LIMIT=
# S3_FORCE_SINGLE_REQUEST=
# S3_ENABLE_CHECKSUM_MODE=
# S3_STORAGE_CLASS=
# S3_MULTIPART_THRESHOLD=
# S3_PERMISSION=
# S3_BATCH_DELETE_LIMIT=
# S3_BATCH_DELETE_RETRY=
# S3_ALIAS_HOST=
# External Authentication
# =======================
@ -187,4 +201,5 @@ DEFAULT_LOCALE=en
# OIDC_REDIRECT_URI=https://mastodon.company/auth/auth/openid_connect/callback
# OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
# OMNIAUTH_ONLY=true
# ONE_CLICK_SSO_LOGIN
# ONE_CLICK_SSO_LOGIN=true
# SECRET_OIDC_CLIENT_SECRET_VERSION=v1

View File

@ -3,8 +3,10 @@
> Your self-hosted, globally interconnected microblogging community
<!-- metadata -->
* **Maintainers**: `@3wordchant` (Matrix: `@3wc:autonomic.zone`), `Benjamin` (Matrix: `@benjaminlj:matrix.org`)
* **Status**: `stable`
* **Category**: Apps
* **Status**: 1
* **Features**: 1
* **Image**: [`tootsuite/mastodon`](https://hub.docker.com/r/tootsuite/mastodon)
* **Healthcheck**: No
* **Backups**: No
@ -22,10 +24,10 @@ the [`abra.sh`](./abra.sh) for more.
1. `abra app new mastodon`
1. `abra app cmd --local <domain> secrets`
1. `abra app cmd --local <domain> secrets_activerecord`
1. `abra app secret insert <domain> smtp_password v1 <password>`
1. `abra app config <domain>` (uncomment SMTP details)
1. `abra app deploy <domain>`
1. `abra app cmd <domain> streaming setup`
Then, on your host (outside of the containers), you'll need to fix permissions
for the volume (see [#10](https://git.coopcloud.tech/coop-cloud/mastodon/issues/10)):
@ -37,7 +39,7 @@ chown -R 991:991 /var/lib/docker/volumes/<domain>_app/_data
And finally, within the `app` container, create an admin account:
```
abra app cmd <domain> admin -- <username> <email>
abra app cmd <domain> app admin -- <username> <email>
```
## Tips & tricks

118
abra.sh
View File

@ -1,27 +1,70 @@
export ENTRYPOINT_CONF_VERSION=v3
export ENTRYPOINT_CONF_VERSION=v7
export ENTRYPOINT_STREAMING_CONF_VERSION=v2
grep=grep
if ! $grep -P --version 2>/dev/null 1>/dev/null
then
echo "$grep doesn't have -P option, trying ggrep"
grep=ggrep
if ! $grep -P --version 2>/dev/null 1>/dev/null
then
echo "If you're on a mac try running \`brew install grep\`"
exit 1
fi
fi
file_env() {
local var="$1"
local fileVar="${var}_FILE"
local def="${2:-}"
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
exit 1
fi
local val="$def"
if [ "${!var:-}" ]; then
val="${!var}"
elif [ "${!fileVar:-}" ]; then
val="$(< "${!fileVar}")"
fi
declare -x -g "$var"="$val"
unset "$fileVar"
}
environment() {
# for sidekiq service bundle exec env var threading
file_env "DB_PASS"
file_env "OTP_SECRET"
file_env "SECRET_KEY_BASE"
file_env "VAPID_PRIVATE_KEY"
file_env "AWS_SECRET_ACCESS_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
declare -x RAILS_ENV=production
}
assets() {
export OTP_SECRET=$(cat /run/secrets/otp_secret)
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
export DB_PASS=$(cat /run/secrets/db_password)
environment
RAILS_ENV=production bundle exec rails assets:precompile
bundle exec rails assets:precompile
}
admin() {
export OTP_SECRET=$(cat /run/secrets/otp_secret)
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
export DB_PASS=$(cat /run/secrets/db_password)
environment
RAILS_ENV=production bin/tootctl accounts create "$1" --email "$2" --confirmed --role Owner
bin/tootctl accounts create "$1" --email "$2" --confirmed --role Owner
bin/tootctl accounts approve "$1"
}
setup() {
export OTP_SECRET=$(cat /run/secrets/otp_secret)
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
export DB_PASS=$(cat /run/secrets/db_password)
RAILS_ENV=production bundle exec rake db:setup
shell() {
## Run a shell with proper environment
environment
bash $@
}
secrets() {
@ -29,17 +72,17 @@ secrets() {
docker context use default > /dev/null 2>&1
MASTO_VERSION="v4.1.0"
MASTO_VERSION="v4.3.8"
echo "Generating secrets for a new Mastodon deployment..."
echo ""
SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:$MASTO_VERSION bundle exec rake secret)
SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:$MASTO_VERSION bundle exec rails secret)
abra app secret insert "$APP_NAME" secret_key_base v1 "$SECRET_KEY_BASE"
echo "SECRET_KEY_BASE = $SECRET_KEY_BASE"
echo ""
OTP_SECRET=$(docker run --rm tootsuite/mastodon:$MASTO_VERSION bundle exec rake secret)
OTP_SECRET=$(docker run --rm tootsuite/mastodon:$MASTO_VERSION bundle exec rails secret)
abra app secret insert "$APP_NAME" otp_secret v1 "$OTP_SECRET"
echo "OTP_SECRET = $OTP_SECRET"
echo ""
@ -51,8 +94,8 @@ secrets() {
bundle exec rake mastodon:webpush:generate_vapid_key \
> /tmp/key.txt
VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
VAPID_PRIVATE_KEY=$($grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
VAPID_PUBLIC_KEY=$($grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
rm -rf /tmp/key.txt
echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY"
@ -70,3 +113,38 @@ secrets() {
echo "run \"abra app secret insert $APP_NAME smtp_password v1 YOURSMTPPASSWORD\""
echo ""
}
secrets_activerecord() {
set -e
docker context use default > /dev/null 2>&1
MASTO_VERSION="v4.3.8"
echo "Generating activerecord secrets for an updated deployment"
echo ""
docker run \
-e SECRET_KEY_BASE="$SECRET_KEY_BASE" \
-e OTP_SECRET="$OTP_SECRET" \
--rm tootsuite/mastodon:$MASTO_VERSION \
bundle exec rake db:encryption:init \
> /tmp/activerecord.txt
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$($grep ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY /tmp/activerecord.txt | cut -d'=' -f2)
abra app secret insert "$APP_NAME" are_deterministic_key v1 "$ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
echo "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY = $ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
echo ""
ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$($grep ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT /tmp/activerecord.txt | cut -d'=' -f2)
abra app secret insert "$APP_NAME" are_key_derivation_salt v1 "$ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
echo "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT = $ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
echo ""
ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$($grep ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY /tmp/activerecord.txt | cut -d'=' -f2)
abra app secret insert "$APP_NAME" are_primary_key v1 "$ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
echo "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY = $ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
echo ""
rm -rf /tmp/activerecord.txt
}

View File

@ -0,0 +1,12 @@
---
version: "3.8"
services:
app:
environment:
- MAX_CHARS
# NOTE: See [0] for background on why this is necessary
# [0]: See https://github.com/mastodon/mastodon/pull/30091
user: root
command: >
/bin/sh -c 'set -x && ls && sed -i -e "s/500/$MAX_CHARS/g" app/javascript/mastodon/features/compose/components/compose_form.jsx && sed -i -e "s/500/$MAX_CHARS/g" app/validators/status_length_validator.rb && rm -f /mastodon/tmp/pids/server.pid && su -c "RAILS_ENV=production bundle exec rails s -p 3000"'

34
compose.elasticsearch.yml Normal file
View File

@ -0,0 +1,34 @@
---
version: "3.8"
services:
es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "cluster.name=es-mastodon"
- "discovery.type=single-node"
- "bootstrap.memory_lock=true"
networks:
- internal
volumes:
- es:/usr/share/elasticsearch/data
ulimits:
memlock:
soft: -1
hard: -1
app:
environment: &es-env
- "ES_ENABLED=true"
- "ES_HOST=es"
- "ES_PORT=9200"
streaming:
environment: *es-env
sidekiq:
environment: *es-env
volumes:
es:

View File

@ -12,8 +12,15 @@ services:
- OIDC_SCOPE
- OIDC_UID_FIELD
- OIDC_CLIENT_ID
- OIDC_CLIENT_SECRET
- OIDC_REDIRECT_URI
- OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED
- OMNIAUTH_ONLY
- ONE_CLICK_SSO_LOGIN
- OIDC_CLIENT_SECRET_FILE=/run/secrets/oidc_client_secret
secrets:
- oidc_client_secret
secrets:
oidc_client_secret:
name: ${STACK_NAME}_oidc_client_secret_${SECRET_OIDC_CLIENT_SECRET_VERSION}
external: true

42
compose.s3.yml Normal file
View File

@ -0,0 +1,42 @@
---
version: "3.8"
services:
app:
environment: &s3-env
- S3_ENABLED=true
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY_FILE=/run/secrets/aws_secret_access_key
- S3_BUCKET
- S3_REGION
- S3_PROTOCOL
- S3_HOSTNAME
- S3_ENDPOINT
- S3_SIGNATURE_VERSION
- S3_OVERRIDE_PATH_STYLE
- S3_OPEN_TIMEOUT
- S3_READ_TIMEOUT
- S3_RETRY_LIMIT
- S3_FORCE_SINGLE_REQUEST
- S3_ENABLE_CHECKSUM_MODE
- S3_STORAGE_CLASS
- S3_MULTIPART_THRESHOLD
- S3_PERMISSION
- S3_BATCH_DELETE_LIMIT
- S3_BATCH_DELETE_RETRY
- S3_ALIAS_HOST
secrets: &s3-secrets
- aws_secret_access_key
streaming:
environment: *s3-env
secrets: *s3-secrets
sidekiq:
environment: *s3-env
secrets: *s3-secrets
secrets:
aws_secret_access_key:
name: ${STACK_NAME}_aws_secret_access_key_${SECRET_AWS_SECRET_ACCESS_KEY_VERSION}
external: true

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: tootsuite/mastodon:v4.1.0
image: tootsuite/mastodon:v4.5.3
command: |
bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
networks: &bothNetworks
@ -20,11 +20,14 @@ services:
- "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=0.2.1+v4.1.0"
- "coop-cloud.${STACK_NAME}.version=2.1.3+v4.5.3"
configs: &configs
- source: entrypoint_sh
target: /usr/local/bin/entrypoint.sh
mode: 0555
- source: entrypoint_streaming_sh
target: /usr/local/bin/entrypoint_streaming.sh
mode: 0555
entrypoint: &entrypoint /usr/local/bin/entrypoint.sh
volumes: &appVolume
- app:/opt/mastodon/public/system
@ -34,7 +37,13 @@ services:
- secret_key_base
- smtp_password
- vapid_private_key
- are_deterministic_key
- are_key_derivation_salt
- are_primary_key
environment: &env
- ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_FILE=/run/secrets/are_deterministic_key
- ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_FILE=/run/secrets/are_key_derivation_salt
- ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_FILE=/run/secrets/are_primary_key
- ALLOW_ACCESS_TO_HIDDEN_SERVICE
- ALTERNATE_DOMAINS
- AUTHORIZED_FETCH
@ -46,6 +55,7 @@ services:
- DB_NAME
- DB_PORT
- DB_USER
- DB_PASS_FILE=/run/secrets/db_password
- DEFAULT_LOCALE
- EMAIL_DOMAIN_ALLOWLIST
- EMAIL_DOMAIN_DENYLIST
@ -119,10 +129,10 @@ services:
- WEB_DOMAIN
streaming:
image: tootsuite/mastodon:v4.1.0
command: node ./streaming
image: tootsuite/mastodon-streaming:v4.5.3
command: node ./streaming/index.js
configs: *configs
entrypoint: *entrypoint
entrypoint: /usr/local/bin/entrypoint_streaming.sh
secrets: *secrets
networks: *bothNetworks
deploy:
@ -140,7 +150,7 @@ services:
volumes: *appVolume
sidekiq:
image: tootsuite/mastodon:v4.1.0
image: tootsuite/mastodon:v4.5.3
secrets: *secrets
command: bundle exec sidekiq
configs: *configs
@ -154,11 +164,12 @@ services:
environment: *env
db:
image: postgres:15.2-alpine
image: pgautoupgrade/pgautoupgrade:18-alpine
networks: &internalNetwork
- internal
volumes:
- postgres:/var/lib/postgresql/data
- postgres:/var/lib/postgresql
secrets:
- db_password
environment:
@ -167,29 +178,13 @@ services:
- POSTGRES_USER=${DB_USER}
redis:
image: redis:7.4-alpine
image: redis:8.4-alpine
networks: *internalNetwork
healthcheck:
test: ["CMD", "redis-cli", "ping"]
volumes:
- redis:/data
es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "cluster.name=es-mastodon"
- "discovery.type=single-node"
- "bootstrap.memory_lock=true"
networks:
- internal
volumes:
- es:/usr/share/elasticsearch/data
ulimits:
memlock:
soft: -1
hard: -1
secrets:
secret_key_base:
name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
@ -206,12 +201,20 @@ secrets:
smtp_password:
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true
are_deterministic_key:
name: ${STACK_NAME}_are_deterministic_key_${SECRET_ARE_DETERMINISTIC_KEY_VERSION}
external: true
are_key_derivation_salt:
name: ${STACK_NAME}_are_key_derivation_salt_${SECRET_ARE_KEY_DERIVATION_SALT_VERSION}
external: true
are_primary_key:
name: ${STACK_NAME}_are_primary_key_${SECRET_ARE_PRIMARY_KEY_VERSION}
external: true
volumes:
app:
redis:
postgres:
es:
networks:
internal:
@ -223,3 +226,7 @@ configs:
name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang
entrypoint_streaming_sh:
name: ${STACK_NAME}_entrypoint_streaming_conf_${ENTRYPOINT_STREAMING_CONF_VERSION}
file: entrypoint-streaming.sh.tmpl
template_driver: golang

View File

@ -0,0 +1,35 @@
#!/bin/bash
set -eu
file_env() {
local var="$1"
local fileVar="${var}_FILE"
local def="${2:-}"
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
exit 1
fi
local val="$def"
if [ "${!var:-}" ]; then
val="${!var}"
elif [ "${!fileVar:-}" ]; then
val="$(< "${!fileVar}")"
fi
declare -x -g "$var"="$val"
unset "$fileVar"
}
file_env "DB_PASS"
file_env "OTP_SECRET"
file_env "SECRET_KEY_BASE"
file_env "VAPID_PRIVATE_KEY"
file_env "AWS_SECRET_ACCESS_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
/usr/local/bin/docker-entrypoint.sh "$@"

View File

@ -2,11 +2,45 @@
set -eu
export DB_PASS=$(cat /run/secrets/db_password)
export OTP_SECRET=$(cat $OTP_SECRET_FILE)
export SECRET_KEY_BASE=$(cat $SECRET_KEY_BASE_FILE)
export VAPID_PRIVATE_KEY=$(cat $VAPID_PRIVATE_KEY_FILE)
file_env() {
local var="$1"
local fileVar="${var}_FILE"
local def="${2:-}"
sed -i '/- admin$/d' /opt/mastodon/config/settings.yml
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
exit 1
fi
local val="$def"
if [ "${!var:-}" ]; then
val="${!var}"
elif [ "${!fileVar:-}" ]; then
val="$(< "${!fileVar}")"
fi
declare -x -g "$var"="$val"
unset "$fileVar"
}
file_env "DB_PASS"
file_env "SMTP_PASSWORD"
file_env "OTP_SECRET"
file_env "SECRET_KEY_BASE"
file_env "VAPID_PRIVATE_KEY"
file_env "AWS_SECRET_ACCESS_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
{{ if eq (env "OIDC_ENABLED") "true" }}
file_env "OIDC_CLIENT_SECRET"
{{ end }}
# NOTE: this was working in mastodon 4.2 but breaks in 4.3
# sed -i '/- admin$/d' /opt/mastodon/config/settings.yml
RAILS_ENV=production bundle exec rake db:migrate
/usr/bin/tini -s -- "$@"

11
release/1.0.0+v4.3.1 Normal file
View File

@ -0,0 +1,11 @@
WARNING❗ This release requires adding new secrets, and will not deploy successfully without them.
Run `abra app cmd --local <domain> secrets_activerecord` to generate and store these secrets.
You will also need to add this to your config (`abra app config <domain>`):
```
SECRET_ARE_DETERMINISTIC_KEY_VERSION=v1
SECRET_ARE_KEY_DERIVATION_SALT_VERSION=v1
SECRET_ARE_PRIMARY_KEY_VERSION=v1
```

1
release/1.1.0+v4.3.8 Normal file
View File

@ -0,0 +1 @@
MAX_CHARS now supported; see ~/.abra/recipes/.env.sample

1
release/2.0.0+v4.4.7 Normal file
View File

@ -0,0 +1 @@
This release includes several Postgres major version upgrades; this should work automatically, but please take extra care to make a database backup before upgrading!

6
renovate.json Normal file
View File

@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}