diff --git a/.env b/.env index b0b3339..546105c 100644 --- a/.env +++ b/.env @@ -1,7 +1,8 @@ # don't forget to add the minus before the version # example: VERSION=-3.2.0-1 -IMAGE_REPO=zammad/zammad-docker-compose +IMAGE_REPO=monotek/zammad-docker-compose VERSION= RESTART=always POSTGRES_USER=zammad POSTGRES_PASS=zammad +POSTGRES_DB=zammad_production diff --git a/containers/zammad-postgresql/backup.sh b/containers/zammad-postgresql/backup.sh index ec620f3..77793b5 100644 --- a/containers/zammad-postgresql/backup.sh +++ b/containers/zammad-postgresql/backup.sh @@ -33,7 +33,7 @@ function zammad_backup { fi #db backup - pg_dump --dbname=postgresql://"${POSTGRESQL_USER}:${POSTGRES_PASSWORD}"@"${POSTGRESQL_HOST}":"${POSTGRESQL_PORT}"/"${POSTGRESQL_DB}" | gzip > "${BACKUP_DIR}"/"${TIMESTAMP}"_zammad_db.psql.gz + pg_dump --dbname=postgresql://"${POSTGRESQL_USER}:${POSTGRESQL_PASSWORD}"@"${POSTGRESQL_HOST}":"${POSTGRESQL_PORT}"/"${POSTGRESQL_DB}" | gzip > "${BACKUP_DIR}"/"${TIMESTAMP}"_zammad_db.psql.gz } if [ "$1" = 'zammad-backup' ]; then diff --git a/docker-compose.yml b/docker-compose.yml index 844ae72..7f91f07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,8 @@ services: environment: - BACKUP_SLEEP=86400 - HOLD_DAYS=10 - - POSTGRES_USER=${POSTGRES_USER} - - POSTGRES_PASSWORD=${POSTGRES_PASS} + - POSTGRESQL_USER=${POSTGRES_USER} + - POSTGRESQL_PASSWORD=${POSTGRES_PASS} zammad-elasticsearch: image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION} @@ -67,6 +67,7 @@ services: environment: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASS} + - POSTGRES_DB=${POSTGRES_DB} zammad-railsserver: command: ["zammad-railsserver"]