Add zulip ppa in Dockerfile again

Changed version tags 1.3.7 to 1.3.7-1

Dockerfile

@@ -6,8 +6,12 @@ ENV ZULIP_VERSION="1.3.7" ZULIP_CHECKSUM="88bfa668eb14e07b0b806977db2ae2cd4d7e7e
 ADD entrypoint.sh /entrypoint.sh
 ADD zulip-puppet /root/zulip-puppet
 
-RUN apt-get -qq update -q && \
-    apt-get -qq dist-upgrade -y && \
+RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc && \
+    apt-key add /root/zulip-ppa.asc && \
+    echo "deb http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main" > /etc/apt/sources.list.d/zulip.list && \
+    echo "deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main" >> /etc/apt/sources.list.d/zulip.list && \
+    apt-get -qq update && \
+    apt-get -q dist-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -q install -y puppet tar git openssl python-dev python-six python-pbs && \
     mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \
     wget -q "https://www.zulip.com/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -P "/tmp" && \

README.md

@@ -23,7 +23,7 @@ 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:1.3.7`
+`docker pull quay.io/galexrt/zulip:1.3.7-1`
 
 ### For the latest development image changes use:
 `docker pull quay.io/galexrt/zulip:dev`

docker-compose.yml

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

kubernetes/zulip-rc.yml

@@ -1,20 +1,20 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: zulip-v1.3.7
+  name: zulip-v1.3.7-1
   namespace: default
   labels:
-    version: v1.3.7
+    version: v1.3.7-1
     app: zulip
 spec:
   replicas: 1
   selector:
-    version: v1.3.7
+    version: v1.3.7-1
     app: gitlab
   template:
     metadata:
       labels:
-        version: v1.3.7
+        version: v1.3.7-1
         app: gitlab
     spec:
       containers:
@@ -66,7 +66,7 @@ spec:
           - name: postgresql-persistent-storage
             mountPath: /var/lib/postgresql
       - name: zulip
-        image: quay.io/galexrt/zulip:1.3.7
+        image: quay.io/galexrt/zulip:1.3.7-1
         resources:
           limits:
             cpu: 100m

scripts/docker_start.sh

@@ -65,4 +65,4 @@ docker run \
     -e "ZULIP_SETTINGS_DEFAULT_FROM_EMAIL=Zulip <noreply@example.com>" \
     -e "ZULIP_SETTINGS_EMAIL_HOST=smtp.example.com" \
     -e "ZULIP_SETTINGS_EMAIL_HOST_USER=noreply@example.com" \
-    quay.io/galexrt/zulip:1.3.7
+    quay.io/galexrt/zulip:1.3.7-1

zulip-puppet/manifests/voyager.pp

@@ -10,7 +10,7 @@ class zulip::voyager {
     key => '84C2BE60E50E336456E4749CE84240474E26AE47',
     key_source => 'https://zulip.com/dist/keys/zulip.asc',
     pin => '995',
-    include_src => false,
+    include_src => true,
   }
 
   file { "/etc/nginx/sites-available/zulip-enterprise":