paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-04 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the old memcached env vars

Browse Source
This commit is contained in:
Alexander Trost
2016-01-24 20:01:16 +01:00
parent 7cc2095f27
commit cba5efe541
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -32,7 +32,7 @@ zulip:
- redis - redis
environment: environment:
DB_HOST: "database" DB_HOST: "database"
ZULIP_SETTINGS_MEMCACHED_HOST: "memcached" ZULIP_SETTINGS_MEMCACHED_LOCATION: "memcached:11211"
ZULIP_SETTINGS_RABBITMQ_HOST: "rabbitmq" ZULIP_SETTINGS_RABBITMQ_HOST: "rabbitmq"
ZULIP_SECRETS_email_password: "12345" ZULIP_SECRETS_email_password: "12345"
ZULIP_SECRETS_rabbitmq_password: "zulip" ZULIP_SECRETS_rabbitmq_password: "zulip"

5
entrypoint.sh
View File

@@ -28,10 +28,7 @@ ZULIP_SETTINGS_RATE_LIMITING="${ZULIP_SETTINGS_RATE_LIMITING:-True}"
ZULIP_SETTINGS_REDIS_HOST="${ZULIP_SETTINGS_REDIS_HOST:-127.0.0.1}" ZULIP_SETTINGS_REDIS_HOST="${ZULIP_SETTINGS_REDIS_HOST:-127.0.0.1}"
ZULIP_SETTINGS_REDIS_PORT="${ZULIP_SETTINGS_REDIS_PORT:-6379}" ZULIP_SETTINGS_REDIS_PORT="${ZULIP_SETTINGS_REDIS_PORT:-6379}"
# Memcached # Memcached
ZULIP_SETTINGS_MEMCACHED_HOST="${ZULIP_SETTINGS_MEMCACHED_HOST:-127.0.0.1}" ZULIP_SETTINGS_MEMCACHED_LOCATION="${ZULIP_SETTINGS_MEMCACHED_LOCATION:-127.0.0.1:11211}"
ZULIP_SETTINGS_MEMCACHED_HOST_PORT="${ZULIP_SETTINGS_MEMCACHED_HOST_PORT:-11211}"
ZULIP_SETTINGS_MEMCACHED_LOCATION="${:-$(echo $ZULIP_SETTINGS_MEMCACHED_HOST:$ZULIP_SETTINGS_MEMCACHED_HOST_PORT)}"
unset ZULIP_SETTINGS_MEMCACHED_HOST ZULIP_SETTINGS_MEMCACHED_HOST_PORT
# Nginx settings # Nginx settings
NGINX_WORKERS="${NGINX_WORKERS:-1}" NGINX_WORKERS="${NGINX_WORKERS:-1}"
NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}" NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}"

16
kubernetes/zulip-rc.yml
View File

@@ -10,12 +10,12 @@ spec:
replicas: 1 replicas: 1
selector: selector:
version: v1.3.9-1 version: v1.3.9-1
app: gitlab app: zulip
template: template:
metadata: metadata:
labels: labels:
version: v1.3.9-1 version: v1.3.9-1
app: gitlab app: zulip
spec: spec:
containers: containers:
- name: redis - name: redis
@@ -74,14 +74,10 @@ spec:
value: "redis" value: "redis"
- name: RABBITMQ_HOST - name: RABBITMQ_HOST
value: "rabbitmq" value: "rabbitmq"
- name: ZULIP_USER_EMAIL
value: "example@example.com"
- name: ZULIP_USER_DOMAIN
value: "example.com"
- name: ZULIP_AUTH_BACKENDS - name: ZULIP_AUTH_BACKENDS
value: "EmailAuthBackend" value: "EmailAuthBackend"
- name: ZULIP_SECRETS_email_password - name: ZULIP_SECRETS_email_password
value: "12345" value: "123456789"
- name: ZULIP_SETTINGS_EXTERNAL_HOST - name: ZULIP_SETTINGS_EXTERNAL_HOST
value: "localhost" value: "localhost"
- name: ZULIP_SETTINGS_ZULIP_ADMINISTRATOR - name: ZULIP_SETTINGS_ZULIP_ADMINISTRATOR
@@ -96,6 +92,12 @@ spec:
value: "smtp.example.com" value: "smtp.example.com"
- name: ZULIP_SETTINGS_EMAIL_HOST_USER - name: ZULIP_SETTINGS_EMAIL_HOST_USER
value: "noreply@example.com" value: "noreply@example.com"
- name: ZULIP_USER_EMAIL
value: "example@example.com"
- name: ZULIP_USER_DOMAIN
value: "example.com"
- name: ZULIP_USER_PASS
value: "123456789"
ports: ports:
- containerPort: 80 - containerPort: 80
name: http name: http