Getting ready to release v1.3.7-2 of the image

Dockerfile

@@ -1,25 +1,25 @@
 FROM quay.io/sameersbn/ubuntu:latest
 MAINTAINER Alexander Trost <[email protected]>
 
-ENV ZULIP_VERSION="master" DATA_DIR="/data"
+ENV ZULIP_VERSION="1.3.7" DATA_DIR="/data"
 
 ADD entrypoint.sh /entrypoint.sh
 ADD puppet/zulip/ /root/puppet-zulip
 
-RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc && \
-    apt-key add /root/zulip-ppa.asc && \
+RUN wget -qO - https://zulip.com/dist/keys/zulip-ppa.asc | \
+    apt-key add - && \
     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 install -y puppet git python-dev python-six python-pbs && \
     mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \
-    echo "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf && \
     cd /root/zulip && \
     git clone https://github.com/zulip/zulip.git . && \
     git checkout "$ZULIP_VERSION" && \
     cp -rf /root/puppet-zulip/* /root/zulip/puppet/zulip/ && \
     rm -rf /root/puppet-zulip && \
+    echo "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf && \
     /root/zulip/scripts/zulip-puppet-apply -f && \
     cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \
     ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \

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

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.7-1"
+  image: "quay.io/galexrt/zulip:v1.3.7-2"
   ports:
     - "80:80"
     - "443:443"

kubernetes/zulip-rc.yml

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

scripts/docker_start.sh

@@ -59,4 +59,4 @@ docker run \
     -e "ZULIP_SETTINGS_DEFAULT_FROM_EMAIL=Zulip <[email protected]>" \
     -e "ZULIP_SETTINGS_EMAIL_HOST=smtp.example.com" \
     -e "[email protected]" \
-    quay.io/galexrt/zulip:1.3.7-1
+    quay.io/galexrt/zulip:1.3.7-2