caparazondigital/docker-compose
2
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
A 2025-01-15 10:46:50 -08:00
parent 3beb597593
commit 6d4ff5a030
7 changed files with 42 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/compose/bridge.docker-compose.yml
View File

@ -15,4 +15,3 @@ services:
- "28729:28729"
volumes:
- bridge_storage:/var/opt/ouinet
restart: always

4
conf/compose/delta.docker-compose.yml
View File

@ -23,7 +23,6 @@ services:
- back
depends_on:
- caddy
restart: always
# dovecot is running as a part of the delta chat service
dovecot:
@ -39,7 +38,6 @@ services:
- back
depends_on:
- caddy
restart: always
# mailadm is running as a part of the delta chat service
mailadm:
@ -59,4 +57,4 @@ services:
- back
depends_on:
- caddy
restart: always

2
conf/compose/docker-compose.yml
View File

@ -36,10 +36,8 @@ services:
configs:
- source: caddy-caddyfile-config
target: /etc/caddy/Caddyfile
restart: always
configs:
caddy-caddyfile-config:
template_driver: golang
file: ../caddy/Caddyfile.tmpl
external: false

7
conf/compose/element.docker-compose.yml
View File

@ -42,13 +42,11 @@ services:
uid: '991'
gid: '991'
mode: 0644
restart: always
synapse-pg:
restart: always
image: postgres:14-alpine
healthcheck:
test: ['CMD', 'pg_isready', '-U', 'postgres']
test: ['CMD', 'pg_isready', '-U', 'postgres']
environment:
- 'POSTGRES_HOST_AUTH_METHOD=trust'
- 'POSTGRES_INITDB_ARGS=--encoding="UTF8" --lc-collate="C" --lc-ctype="C"'
@ -84,7 +82,6 @@ services:
target: /app/config.json
- source: element-nginx-config
target: /etc/nginx/conf.d/default.conf
restart: always
configs:
synapse-homeserver-config:
@ -97,11 +94,9 @@ configs:
file: ../synapse/matrix.${DWEB_DOMAIN}.log.config
external: false
element-json-config:
template_driver: golang
file: ../element/config.json
external: false
element-nginx-config:
template_driver: golang
file: ../element/nginx.conf
external: false

15
conf/compose/mastodon.docker-compose.yml
View File

@ -12,7 +12,6 @@ services:
### MASTODON
mastodon-redis:
restart: always
image: redis:7.0-alpine
healthcheck:
test: ['CMD', 'redis-cli', 'ping']
@ -21,10 +20,8 @@ services:
- mastodon_redis:/data
networks:
- mast-int
restart: always
mastodon-web:
restart: always
image: tootsuite/mastodon:v4.3.0
#healthcheck:
#test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
@ -52,10 +49,8 @@ services:
networks:
- mast-int
- back
restart: always
mastodon-streaming:
restart: always
image: tootsuite/mastodon-streaming:v4.3.2
healthcheck:
test: wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1
@ -65,7 +60,6 @@ services:
- "127.0.0.1:4000:4000"
environment:
LOCAL_DOMAIN: "mastodon.${DWEB_DOMAIN}"
SMTP_FROM_ADDRESS: "notifications@${DWEB_DOMAIN}"
command: node ./streaming
depends_on:
- mastodon-db
@ -73,22 +67,19 @@ services:
networks:
- mast-int
- back
restart: always
mastodon-sidekiq:
restart: always
image: tootsuite/mastodon:v4.3.2
entrypoint:
- sh
- -c
- "service sendmail start && /usr/bin/tini -- bundle exec sidekiq"
- "/usr/bin/tini -- bundle exec sidekiq"
healthcheck:
test: ps aux | grep '[s]idekiq\ 6' || false
env_file: ../mastodon/env.production
environment:
LOCAL_DOMAIN: "mastodon.${DWEB_DOMAIN}"
SMTP_FROM_ADDRESS: "notifications@${DWEB_DOMAIN}"
command: bundle exec sidekiq
depends_on:
- mastodon-db
- mastodon-redis
@ -100,18 +91,16 @@ services:
subpath: system
networks:
- mast-int
restart: always
mastodon-db:
restart: always
image: postgres:14.13-alpine
healthcheck:
test: ['CMD', 'pg_isready', '-U', 'postgres']
environment:
- 'POSTGRES_HOST_AUTH_METHOD=trust'
- 'POSTGRES_DB=mastodon'
volumes:
- mastodon_db:/var/lib/postgresql/data
networks:
- mast-int
restart: always

1
conf/mastodon/example.env.production
View File

@ -7,6 +7,7 @@ SINGLE_USER_MODE=false
SECRET_KEY_BASE=
OTP_SECRET=
VAPID_KEYS=
ACTIVE_RECORD=
DB_HOST=mastodon-db
DB_PORT=5432
DB_NAME=mastodon

73
install.sh
View File

@ -13,22 +13,22 @@ COMPOSE_FILES="-f ./conf/compose/docker-compose.yml "
# Docker saved file names
FILES=(
"dcomms_conf_v2.tar" # If we can grab the install script we can likely grab the configs.
"caddy_2.6.4.tar"
# "dcomms_conf_v2.tar" # If we can grab the install script we can likely grab the configs.
# "caddy_2.6.4.tar"
)
D_IMAGES=("caddy:2.6.4")
DCOMMS_INSTANCES=(
"kyiv.dcomm.net.ua"
"odessa.dcomm.net.ua"
"kharkiv.dcomm.net.ua"
"lviv.dcomm.net.ua"
"lviv2.dcomm.net.ua"
"rivne.dcomm.net.ua"
"kherson.dcomm.net.ua"
"mykolayiv.dcomm.net.ua"
# "kyiv.dcomm.net.ua"
# "odessa.dcomm.net.ua"
# "kharkiv.dcomm.net.ua"
# "lviv.dcomm.net.ua"
# "lviv2.dcomm.net.ua"
# "rivne.dcomm.net.ua"
# "kherson.dcomm.net.ua"
# "mykolayiv.dcomm.net.ua"
)
IPFS_GATEWAYS=(
@ -109,8 +109,8 @@ check_requirements () {
detect_connectivity () {
# This function tests all available means to retrieve the dComms repository.
if sudo docker pull hello-world >/dev/null 2>&1; then
sudo docker rmi hello-world >/dev/null 2>&1
if docker pull hello-world >/dev/null 2>&1; then
docker rmi hello-world >/dev/null 2>&1
printf "${GREEN}## Successfully connected to Docker Hub${NC}\n"
HUB_REACHABLE=true
else
@ -174,7 +174,7 @@ detect_connectivity () {
#Spins up a temporary docker container to generate synapse config files and keys
matrix_config () {
printf "${YELLOW}## Generating synapse config${NC}\n"
sudo docker run -it --rm \
docker run --rm \
--mount type=bind,src=$(readlink -f $DCOMMS_DIR/conf/synapse),dst=/data \
-e SYNAPSE_SERVER_NAME=matrix.$DWEB_DOMAIN \
-e SYNAPSE_REPORT_STATS=no \
@ -182,17 +182,17 @@ matrix_config () {
matrixdotorg/synapse:v1.121.1 generate 2>/dev/null
sudo chown -R $USER:$USER $DCOMMS_DIR/conf/synapse/
sed -i -z "s/database.*homeserver.db//" $DCOMMS_DIR/conf/element/config.json
sed -i "s/# vim:ft=yaml//" $DCOMMS_DIR/conf/element/config.json
sed -i -z "s/database.*homeserver.db//" $DCOMMS_DIR/conf/synapse/config.json
sed -i "s/# vim:ft=yaml//" $DCOMMS_DIR/conf/synapse/config.json
printf "enable_registration: true\n" >> $DCOMMS_DIR/conf/element/config.json
printf "registration_requires_token: true\n" >> $DCOMMS_DIR/conf/element/config.json
printf "encryption_enabled_by_default_for_room_type: all\n" >> $DCOMMS_DIR/conf/element/config.json
printf "rc_registration:\n per_second: 0.1 \n burst_count: 2\n" >> $DCOMMS_DIR/conf/element/config.json
printf "presence:\n enabled: false\n" >> $DCOMMS_DIR/conf/element/config.json
printf "database:\n name: psycopg2\n txn_limit: 10000\n args:\n" >> $DCOMMS_DIR/conf/element/config.json
printf " user: synapse\n password: null\n database: synapse\n host: localhost\n" >> $DCOMMS_DIR/conf/element/config.json
printf " port: 5432\n cp_min: 5\n cp_max: 10\n" >> $DCOMMS_DIR/conf/element/config.json
printf "enable_registration: true\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "registration_requires_token: true\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "encryption_enabled_by_default_for_room_type: all\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "rc_registration:\n per_second: 0.1 \n burst_count: 2\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "presence:\n enabled: false\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "database:\n name: psycopg2\n txn_limit: 10000\n args:\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf " user: synapse\n password: null\n database: synapse\n host: localhost\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf " port: 5432\n cp_min: 5\n cp_max: 10\n" >> $DCOMMS_DIR/conf/synapse/config.json
sed -i "s/TEMPLATE/$DWEB_DOMAIN/" $DCOMMS_DIR/conf/element/config.json
}
@ -200,26 +200,26 @@ matrix_config () {
#Mastodon's config file requires a number of keys to be generated. We spin up a temporary container to do this.
#Volume must be removed before running
mastodon_config () {
sudo docker volume rm masto_data_tmp 2> /dev/null || true
docker volume rm masto_data_tmp 2> /dev/null || true
printf "${YELLOW}## Generating mastodon config${NC}\n"
sudo cp -a $DCOMMS_DIR/conf/mastodon/example.env.production $DCOMMS_DIR/conf/mastodon/env.production
SECRET_KEY_BASE=`sudo docker run -it --rm \
SECRET_KEY_BASE=$(docker run --rm \
--mount type=volume,src=masto_data_tmp,dst=/opt/mastodon \
-e RUBYOPT=-W0 tootsuite/mastodon:v4.3.2 \
bundle exec rake secret` >/dev/null
bundle exec rails secret) >/dev/null
OTP_SECRET=$(sudo docker run -it --rm \
OTP_SECRET=$(docker run --rm \
--mount type=volume,src=masto_data_tmp,dst=/opt/mastodon \
-e RUBYOPT=-W0 tootsuite/mastodon:v4.3.2 \
bundle exec rake secret) >/dev/null
bundle exec rails secret) >/dev/null
VAPID_KEYS=$(sudo docker run -it --rm \
VAPID_KEYS=$(docker run --rm \
--mount type=volume,src=masto_data_tmp,dst=/opt/mastodon \
-e RUBYOPT=-W0 tootsuite/mastodon:v4.3.2 \
bundle exec rake mastodon:webpush:generate_vapid_key)>/dev/null
bundle exec rails mastodon:webpush:generate_vapid_key)>/dev/null
VAPID_FRIENDLY_KEYS=${VAPID_KEYS//$'\n'/\\$'\n'}
ACTIVE_RECORD_ENCRYPTION=$(sudo docker run -it --rm \
ACTIVE_RECORD_ENCRYPTION=$(docker run --rm \
--mount type=volume,src=masto_data_tmp,dst=/opt/mastodon \
-e RUBYOPT=-W0 tootsuite/mastodon:v4.3.2 \
bundle exec rake db:encryption:init)>/dev/null
@ -239,15 +239,16 @@ mastodon_config () {
printf "${YELLOW}## Initializing mastodon database${NC}\n"
docker compose -f ./conf/compose/mastodon.docker-compose.yml run --rm mastodon-web bundle exec rake db:prepare
docker compose -f ./conf/compose/mastodon.docker-compose.yml run --rm mastodon-web bundle exec rake db:migrate
docker compose -f ./conf/compose/mastodon.docker-compose.yml run --entrypoint="bundle exec rails db:create" --rm mastodon-web
docker compose -f ./conf/compose/mastodon.docker-compose.yml run --entrypoint="bundle exec rake db:prepare" --rm mastodon-web
docker compose -f ./conf/compose/mastodon.docker-compose.yml run --entrypoint="bundle exec rake db:migrate" --rm mastodon-web
docker volume rm -f masto_data_tmp
}
mau_config () {
printf "${YELLOW}## Generating mau bot config${NC}\n"
sudo docker run --rm --mount type=bind,src=$(readlink -f $DCOMMS_DIR/conf/mau),dst=/data dock.mau.dev/maubot/maubot:v0.3.1 1>&2 >/dev/null
docker run --rm --mount type=bind,src=$(readlink -f $DCOMMS_DIR/conf/mau),dst=/data dock.mau.dev/maubot/maubot:v0.3.1 1>&2 >/dev/null
sudo chown -R $USER:$USER $DCOMMS_DIR/conf/mau
MAU_PW=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 18)
printf "${RED}## Mau credentials = admin:$MAU_PW${NC}\n"
@ -397,7 +398,7 @@ main() {
printf "${GREEN}### Grabbing images from Docker Hub.${NC}\n"
for img in ${D_IMAGES[@]}; do
echo "dimg = $img"
if sudo docker pull $img; then
if docker pull $img; then
unset 'FILES[$di]'
((di=di+=1))
fi
@ -409,7 +410,7 @@ main() {
#Might be wise to bring this out of this function so that we can validate before loading
# for f in $DCOMMS_DIR/images/*.tar; do
# echo ""
# cat $f | sudo docker load
# cat $f | docker load
# done
echo "#!/bin/bash" > $DCOMMS_DIR/run.sh