From d34803e91c17ce637eeda0b5513bca866f2797e5 Mon Sep 17 00:00:00 2001
From: Alexander Trost <galexrt@googlemail.com>
Date: Fri, 17 Mar 2017 15:07:40 +0100
Subject: [PATCH] Fix missing rabbitmqctl issue Update to version 1.5.1-3

---
 Dockerfile              |  4 ++--
 README.md               | 10 +++++-----
 docker-compose.yml      |  8 ++++----
 kubernetes/zulip-rc.yml | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6af5675..779af52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM quay.io/sameersbn/ubuntu:latest
 MAINTAINER Alexander Trost <galexrt@googlemail.com>
 
-ENV ZULIP_VERSION="1.5.1" DATA_DIR="/data"
+ENV ZULIP_VERSION="1.5.1-3" DATA_DIR="/data"
 
 COPY custom_zulip_files/ /root/custom_zulip
 
@@ -14,7 +14,7 @@ RUN apt-get -q update && \
     cp -rf /root/custom_zulip/* /root/zulip && \
     rm -rf /root/custom_zulip && \
     PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \
-    ADDITIONAL_PACKAGES="python-dev python-six python-pbs python-crypto expect" \
+    ADDITIONAL_PACKAGES="python-dev python-six python-pbs python-crypto rabbitmq-server expect" \
     /root/zulip/scripts/setup/install && \
     cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
     ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \
diff --git a/README.md b/README.md
index 00425c3..be1b469 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ Image available from:
 * [**Quay.io**](https://quay.io/repository/galexrt/zulip)
 * [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip)
 
-Current Zulip version: `1.5.1`
-Current Docker image version: `1.5.1`
+Current Zulip version: `1.5.1-3`
+Current Docker image version: `1.5.1-3`
 
 ***
 
@@ -30,9 +30,9 @@ See the [Configuration](https://github.com/Galexrt/docker-zulip/wiki/Configurati
 
 ## How to get the container running
 ### To pull the image run
-`docker pull quay.io/galexrt/zulip:1.5.1`
+`docker pull quay.io/galexrt/zulip:1.5.1-3`
 or
-`docker pull galexrt/zulip:1.5.1`
+`docker pull galexrt/zulip:1.5.1-3`
 
 ### For the latest development image run
 `docker pull quay.io/galexrt/zulip:dev`
@@ -64,7 +64,7 @@ A Kubernetes pod file is in the `kubernetes/` folder. The command to run it woul
 The main reason for this to happen is that you are missing a config file named `uwsgi.ini`.
 The get this file run:
 ```
-host$ docker run -it quay.io/galexrt/zulip:1.5.1 bash
+host$ docker run -it quay.io/galexrt/zulip:1.5.1-3 bash
 // In the container shell run
 container# cat /etc/zulip/uwsgi.ini
 // Copy the output of this command into your data volume
diff --git a/docker-compose.yml b/docker-compose.yml
index 65758e9..a28f810 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,10 +23,10 @@ services:
     volumes:
       - "/opt/docker/zulip/redis:/var/lib/redis:rw"
   zulip:
-    image: "quay.io/galexrt/zulip:1.5.1"
-    command:
-    - sleep
-    - "3600"
+    image: "quay.io/galexrt/zulip:1.5.1-2-3"
+#    command:
+#    - sleep
+#    - "3600"
     ports:
       - "80:80"
       - "443:443"
diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml
index 0b22992..23daea9 100644
--- a/kubernetes/zulip-rc.yml
+++ b/kubernetes/zulip-rc.yml
@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: zulip-1.5.1
+  name: zulip-1.5.1-3
   labels:
-    version: 1.5.1
+    version: 1.5.1-3
     app: zulip
 spec:
   replicas: 1
   selector:
-    version: 1.5.1
+    version: 1.5.1-3
     app: zulip
   template:
     metadata:
       labels:
-        version: 1.5.1
+        version: 1.5.1-3
         app: zulip
     spec:
       containers:
@@ -59,7 +59,7 @@ spec:
           - name: postgresql-persistent-storage
             mountPath: /var/lib/postgresql
       - name: zulip
-        image: quay.io/galexrt/zulip:1.5.1
+        image: quay.io/galexrt/zulip:1.5.1-3
         resources:
           limits:
             cpu: 100m