diff --git a/README.md b/README.md index 3a4995d..7dff4da 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # zulip -> One line description of the recipe +> full-featured chat application for teams with threads, file sharing, voice chat, and more with integrations. diff --git a/abra.sh b/abra.sh index f09b86d..bc2f727 100644 --- a/abra.sh +++ b/abra.sh @@ -3,4 +3,5 @@ export PG_BACKUP_VERSION=v1 export MEM_ENTRYPOINT_VERSION=v1 export REDIS_ENTRYPOINT_VERSION=v1 export RABBIT_HEALTHCHECK_VERSION=v1 -export RABBIT_ENTRYPOINT_VERSION=v1 \ No newline at end of file +export RABBIT_ENTRYPOINT_VERSION=v1 +export REDIS_HEALTHCHECK_VERSION=v1 \ No newline at end of file diff --git a/compose.yml b/compose.yml index e5efde3..599bff5 100644 --- a/compose.yml +++ b/compose.yml @@ -10,6 +10,8 @@ services: target: /custom-entrypoint.sh mode: 0555 entrypoint: /custom-entrypoint.sh + command: + - "app:run" environment: DB_HOST: "database" DB_HOST_PORT: "5432" @@ -23,6 +25,10 @@ services: secrets: - zulip_secret - smtp_password + - db_password + - rabbitmq_password + - redis_password + - memcached_password volumes: - "zulip:/data:rw" ulimits: @@ -31,6 +37,7 @@ services: hard: 1048576 networks: - proxy + - internal deploy: labels: - "traefik.enable=true" @@ -39,15 +46,10 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - - "coop-cloud.${STACK_NAME}.version=1.0.0+9.4-0+17.2+4.0.6" + - "coop-cloud.${STACK_NAME}.version=0.1.0+9.4-0" database: - image: "zulip/zulip-postgresql:17.2" - deploy: - labels: - backupbot.backup.pre-hook: "/pg_backup.sh backup" - backupbot.backup.path: "/var/lib/postgresql/data/backup.sql" - backupbot.restore.post-hook: "/pg_backup.sh restore" + image: "zulip/zulip-postgresql:14" environment: POSTGRES_DB: "zulip" POSTGRES_USER: "zulip" @@ -88,12 +90,6 @@ services: environment: SASL_CONF_PATH: "/home/memcache/memcached.conf" MEMCACHED_SASL_PWDB: "/home/memcache/memcached-sasl-db" - healthcheck: - test: ["CMD", "/bin/nc", "-z", "127.0.0.1", "11211"] - interval: 10s - timeout: 2s - retries: 3 - start_period: 3s networks: - internal @@ -112,16 +108,11 @@ services: - rabbitmq_password volumes: - "rabbitmq:/var/lib/rabbitmq:rw" - healthcheck: - test: [ "CMD-SHELL", "/healthcheck.sh" ] - interval: 10s - timeout: 5s - retries: 3 networks: - internal redis: - image: "redis:alpine" + image: "redis:7.2.7" configs: - source: redis_entrypoint target: /custom-entrypoint.sh @@ -140,11 +131,6 @@ services: exec redis-server /etc/redis.conf volumes: - "redis:/data:rw" - healthcheck: - test: [ "CMD-SHELL", "/healthcheck.sh" ] - interval: 10s - timeout: 5s - retries: 3 networks: - internal diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 8a343de..101179a 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -1,5 +1,12 @@ #!/bin/bash +if [ "$DEBUG" = "true" ] || [ "$DEBUG" = "True" ]; then + set -x + set -o functrace +fi +set -e +shopt -s extglob + if [ -f /run/secrets/db_password ]; then export SECRETS_postgres_password=$(cat /run/secrets/db_password) else @@ -36,16 +43,6 @@ else echo "zulip_secret not found, skipping." fi - - - -if [ "$DEBUG" = "true" ] || [ "$DEBUG" = "True" ]; then - set -x - set -o functrace -fi -set -e -shopt -s extglob - # DB aka Database DB_HOST="${DB_HOST:-127.0.0.1}" DB_HOST_PORT="${DB_HOST_PORT:-5432}"