forked from coop-cloud/discourse
Compare commits
7 Commits
7fc57c52a5
...
ec72949bfa
Author | SHA1 | Date |
---|---|---|
3wc | ec72949bfa | |
3wc | 6a5f20bc8a | |
3wc | 3b5d789390 | |
3wc | 22b8f8f265 | |
decentral1se | 5868b83948 | |
decentral1se | 5bef03aabd | |
decentral1se | 0c7847ac15 |
|
@ -42,6 +42,10 @@ A platform for community discussion
|
||||||
3. `git clone plugin.git` for example `https://github.com/discourse/discourse-openid-connect.git`
|
3. `git clone plugin.git` for example `https://github.com/discourse/discourse-openid-connect.git`
|
||||||
4. `abra app restart YOURAPPDOMAIN app`
|
4. `abra app restart YOURAPPDOMAIN app`
|
||||||
|
|
||||||
|
### Events / calendar plugin
|
||||||
|
|
||||||
|
We've had some luck running [discourse-events](https://github.com/paviliondev/discourse-events).
|
||||||
|
|
||||||
## Setup Notes
|
## Setup Notes
|
||||||
|
|
||||||
Until issue #1 is fixed, the default user is `user` and the default password is `bitnami123`
|
Until issue #1 is fixed, the default user is `user` and the default password is `bitnami123`
|
||||||
|
|
44
compose.yml
44
compose.yml
|
@ -3,24 +3,25 @@ version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: bitnami/discourse:2.8.9
|
image: bitnami/discourse:3.0.6
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
# entrypoint: ['tail', '-f', '/dev/null']
|
# entrypoint: ['tail', '-f', '/dev/null']
|
||||||
environment:
|
environment:
|
||||||
- ALLOW_EMPTY_PASSWORD=yes
|
- ALLOW_EMPTY_PASSWORD=yes
|
||||||
- DISCOURSE_HOST=${DOMAIN}
|
|
||||||
- DISCOURSE_DATABASE_HOST=${STACK_NAME}_db
|
- DISCOURSE_DATABASE_HOST=${STACK_NAME}_db
|
||||||
- DISCOURSE_DATABASE_USER=discourse
|
|
||||||
- DISCOURSE_DATABASE_NAME=discourse
|
- DISCOURSE_DATABASE_NAME=discourse
|
||||||
- DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
- DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
- DISCOURSE_DATABASE_USER=discourse
|
||||||
|
- DISCOURSE_HOST=${DOMAIN}
|
||||||
|
- DISCOURSE_NOTIFICATION_EMAIL
|
||||||
|
- DISCOURSE_SMTP_AUTH
|
||||||
- DISCOURSE_SMTP_HOST
|
- DISCOURSE_SMTP_HOST
|
||||||
- DISCOURSE_SMTP_PORT
|
- DISCOURSE_SMTP_PORT
|
||||||
- DISCOURSE_SMTP_USER
|
|
||||||
- DISCOURSE_SMTP_PROTOCOL
|
- DISCOURSE_SMTP_PROTOCOL
|
||||||
- DISCOURSE_SMTP_AUTH
|
- DISCOURSE_SMTP_USER
|
||||||
- DISCOURSE_NOTIFICATION_EMAIL
|
- PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
|
||||||
volumes:
|
volumes:
|
||||||
- 'discourse_data:/bitnami/discourse'
|
- 'discourse_data:/bitnami/discourse'
|
||||||
secrets:
|
secrets:
|
||||||
|
@ -42,7 +43,7 @@ services:
|
||||||
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.3.1+2.8.9"
|
- "coop-cloud.${STACK_NAME}.version=0.5.0+3.0.6"
|
||||||
# healthcheck:
|
# healthcheck:
|
||||||
# test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
# test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||||
# interval: 30s
|
# interval: 30s
|
||||||
|
@ -51,13 +52,18 @@ services:
|
||||||
# start_period: 1m
|
# start_period: 1m
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:13-alpine
|
image: postgres:13
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
volumes:
|
volumes:
|
||||||
- 'postgresql_data:/var/lib/postgresql/data'
|
- 'postgresql_data:/var/lib/postgresql/data'
|
||||||
|
configs:
|
||||||
|
- source: db_entrypoint
|
||||||
|
target: /docker-entrypoint.sh
|
||||||
|
mode: 0555
|
||||||
|
entrypoint: /docker-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||||
- POSTGRES_USER=discourse
|
- POSTGRES_USER=discourse
|
||||||
|
@ -71,37 +77,38 @@ services:
|
||||||
backupbot.backup.path: "/tmp/backup.sql"
|
backupbot.backup.path: "/tmp/backup.sql"
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7.0-alpine
|
image: redis:7.2-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
- 'redis_data:/data'
|
- 'redis_data:/data'
|
||||||
|
|
||||||
sidekiq:
|
sidekiq:
|
||||||
image: bitnami/discourse:2.8.9
|
image: bitnami/discourse:3.0.6
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
depends_on:
|
depends_on:
|
||||||
- discourse
|
- discourse
|
||||||
volumes:
|
volumes:
|
||||||
- 'sidekiq_data:/bitnami/discourse'
|
- 'discourse_data:/bitnami/discourse'
|
||||||
command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
|
command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
environment:
|
environment:
|
||||||
- ALLOW_EMPTY_PASSWORD=yes
|
- ALLOW_EMPTY_PASSWORD=yes
|
||||||
- DISCOURSE_HOST=${DOMAIN}
|
|
||||||
- DISCOURSE_DATABASE_HOST=db
|
- DISCOURSE_DATABASE_HOST=db
|
||||||
|
- DISCOURSE_DATABASE_NAME=discourse
|
||||||
|
- DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- DISCOURSE_DATABASE_PORT_NUMBER=5432
|
- DISCOURSE_DATABASE_PORT_NUMBER=5432
|
||||||
- DISCOURSE_DATABASE_USER=discourse
|
- DISCOURSE_DATABASE_USER=discourse
|
||||||
- DISCOURSE_DATABASE_NAME=discourse
|
- DISCOURSE_HOST=${DOMAIN}
|
||||||
- DISCOURSE_REDIS_HOST=redis
|
- DISCOURSE_REDIS_HOST=redis
|
||||||
- DISCOURSE_REDIS_PORT_NUMBER=6379
|
- DISCOURSE_REDIS_PORT_NUMBER=6379
|
||||||
- DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
|
||||||
- DISCOURSE_SMTP_HOST
|
- DISCOURSE_SMTP_HOST
|
||||||
- DISCOURSE_SMTP_PORT
|
- DISCOURSE_SMTP_PORT
|
||||||
- DISCOURSE_SMTP_USER
|
|
||||||
- DISCOURSE_SMTP_PROTOCOL
|
- DISCOURSE_SMTP_PROTOCOL
|
||||||
|
- DISCOURSE_SMTP_USER
|
||||||
|
- PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
|
||||||
- DISCOURSE_SMTP_AUTH
|
- DISCOURSE_SMTP_AUTH
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
|
@ -113,9 +120,14 @@ volumes:
|
||||||
postgresql_data:
|
postgresql_data:
|
||||||
redis_data:
|
redis_data:
|
||||||
discourse_data:
|
discourse_data:
|
||||||
sidekiq_data:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
|
|
||||||
|
configs:
|
||||||
|
db_entrypoint:
|
||||||
|
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
||||||
|
file: entrypoint.postgres.sh.tmpl
|
||||||
|
template_driver: golang
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
MIGRATION_MARKER=$PGDATA/migration_in_progress
|
||||||
|
OLDDATA=$PGDATA/old_data
|
||||||
|
NEWDATA=$PGDATA/new_data
|
||||||
|
|
||||||
|
echo "Running as $(id)"
|
||||||
|
|
||||||
|
if [ -e $MIGRATION_MARKER ]; then
|
||||||
|
echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f $PGDATA/PG_VERSION ]; then
|
||||||
|
DATA_VERSION=$(cat $PGDATA/PG_VERSION)
|
||||||
|
|
||||||
|
if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
|
||||||
|
echo "postgres data version $DATA_VERSION found, but need $PG_MAJOR. Starting migration"
|
||||||
|
echo "Installing postgres $DATA_VERSION"
|
||||||
|
sed -i "s/$/ $DATA_VERSION/" /etc/apt/sources.list.d/pgdg.list
|
||||||
|
apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
postgresql-$DATA_VERSION \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
echo "shuffling around"
|
||||||
|
gosu postgres mkdir $OLDDATA $NEWDATA
|
||||||
|
chmod 700 $OLDDATA $NEWDATA
|
||||||
|
mv $PGDATA/* $OLDDATA/ || true
|
||||||
|
touch $MIGRATION_MARKER
|
||||||
|
echo "running initdb"
|
||||||
|
# abuse entrypoint script for initdb by making server error out
|
||||||
|
gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true"
|
||||||
|
echo "running pg_upgrade"
|
||||||
|
cd /tmp
|
||||||
|
gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER
|
||||||
|
cp $OLDDATA/pg_hba.conf $NEWDATA/
|
||||||
|
mv $NEWDATA/* $PGDATA
|
||||||
|
rm -rf $OLDDATA
|
||||||
|
rmdir $NEWDATA
|
||||||
|
rm $MIGRATION_MARKER
|
||||||
|
echo "migration complete"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
/usr/local/bin/docker-entrypoint.sh postgres
|
Loading…
Reference in New Issue