Merge branch 'v1.3.12-1'

Dockerfile

@@ -1,7 +1,7 @@
 FROM quay.io/sameersbn/ubuntu:latest
 MAINTAINER Alexander Trost <galexrt@googlemail.com>
 
-ENV ZULIP_VERSION="1.3.12" DATA_DIR="/data"
+ENV ZULIP_VERSION="1.3.12-1" DATA_DIR="/data"
 
 RUN apt-get -q update && \
     apt-get -q dist-upgrade -y && \

README.md

@@ -4,7 +4,7 @@
 * [**Quay.io**](https://quay.io/repository/galexrt/zulip)
 * [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip)
 
-Current Version: `v1.3.12`
+Current Version: `v1.3.12-1`
 
 ***
 
@@ -23,13 +23,13 @@ See the [Configuration](https://github.com/Galexrt/docker-zulip/wiki/Configurati
 
 ***
 
-## How to get the container:
-### For docker use:
-`docker pull quay.io/galexrt/zulip:v1.3.12`
+## How to get the container running
+### To pull the image run
+`docker pull quay.io/galexrt/zulip:v1.3.12-1`
 or
-`docker pull galexrt/zulip:v1.3.12`
+`docker pull galexrt/zulip:v1.3.12-1`
 
-### For the latest development image changes use:
+### For the latest development image run
 `docker pull quay.io/galexrt/zulip:dev`
 
 ***
@@ -37,16 +37,20 @@ or
 ## **Configure your `docker-compose.yml`, before running the container!**
 **If you don't configure it, you'll end up with a misconfigured Zulip Instance!**
 
+Check the wiki page on how to configure the image, [here](https://github.com/galexrt/docker-zulip/wiki/Configuration). [Wiki Page](https://github.com/galexrt/docker-zulip/wiki/Configuration)
+
 ***
 
 ## Starting the container
 To start the container, you have to use either use `docker-compose` or `kubernetes`:
 
 **Don't forget to configure your `docker-compose.yml` properly!!**
-### Using docker-compose:
+
+### Using docker-compose
 Change to the root of the source folder and use `docker-compose up`.
-### Using kubernetes:
-Change to the root of the source folder and use `kubectl create -f ./kubernetes/`.
+
+### Using Kubernetes
+A Kubernetes pod file is in the `kubernetes/` folder. The command to run it would be `kubectl create -f ./kubernetes/`.
 
 ***
 

custom_zulip_files/puppet/zulip/manifests/dockervoyager.pp

@@ -33,5 +33,4 @@ class zulip::dockervoyager {
     mode => 644,
     source => "puppet:///modules/zulip/supervisor/conf.d/nginx.conf",
   }
-  include zulip::localhost_camo
 }

docker-compose.yml

@@ -21,7 +21,7 @@ redis:
   volumes:
     - "/opt/docker/zulip/redis:/var/lib/redis:rw"
 zulip:
-  image: "quay.io/galexrt/zulip:v1.3.12"
+  image: "quay.io/galexrt/zulip:v1.3.12-1"
   ports:
     - "80:80"
     - "443:443"

docker-entrypoint.sh

@@ -34,7 +34,7 @@ fi
 DISABLE_HTTPS="${DISABLE_HTTPS:-false}"
 NGINX_WORKERS="${NGINX_WORKERS:-2}"
 NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}"
-NGINX_MAX_UPLOAD_SIZE="${NGINX_MAX_UPLOAD_SIZE:-20m}"
+NGINX_MAX_UPLOAD_SIZE="${NGINX_MAX_UPLOAD_SIZE:-24m}"
 # Zulip certifcate parameters
 ZULIP_AUTO_GENERATE_CERTS="${ZULIP_AUTO_GENERATE_CERTS:-True}"
 ZULIP_CERTIFICATE_SUBJ="${ZULIP_CERTIFICATE_SUBJ:-}"
@@ -445,7 +445,7 @@ zulipFirstStartInit() {
 zulipMigration() {
     echo "Migrating Zulip to new version ..."
     set +e
-    if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate"; then
+    if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput"; then
         local RETURN_CODE=$?
         echo "Zulip migration failed with exit code $RETURN_CODE. Exiting."
         exit $RETURN_CODE

kubernetes/zulip-rc.yml

@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: zulip-v1.3.12
+  name: zulip-v1.3.12-1
   labels:
-    version: v1.3.12
+    version: v1.3.12-1
     app: zulip
 spec:
   replicas: 1
   selector:
-    version: v1.3.12
+    version: v1.3.12-1
     app: zulip
   template:
     metadata:
       labels:
-        version: v1.3.12
+        version: v1.3.12-1
         app: zulip
     spec:
       containers:
@@ -59,7 +59,7 @@ spec:
           - name: postgresql-persistent-storage
             mountPath: /var/lib/postgresql
       - name: zulip
-        image: quay.io/galexrt/zulip:v1.3.12
+        image: quay.io/galexrt/zulip:v1.3.12-1
         resources:
           limits:
             cpu: 100m