Merge branch 'v1.4.1-1'

README.md

@@ -6,7 +6,7 @@
 * [**Quay.io**](https://quay.io/repository/galexrt/zulip)
 * [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip)
 
-Current Version: `v1.4.1`
+Current Version: `v1.4.1-1`
 
 ***
 
@@ -27,9 +27,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:v1.4.1`
+`docker pull quay.io/galexrt/zulip:v1.4.1-1`
 or
-`docker pull galexrt/zulip:v1.4.1`
+`docker pull galexrt/zulip:v1.4.1-1`
 
 ### For the latest development image run
 `docker pull quay.io/galexrt/zulip:dev`

custom_zulip_files/scripts/lib/install

@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-set -xe
-
-# Assumes we've already been untarred
-
-# Specify options for apt.
-APT_OPTIONS="${APT_OPTIONS:-}"
-# Install additional packages using apt.
-ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES:-}
-# Deployment type is almost always voyager.
-DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}"
-# Comma-separated list of puppet manifests to install.  default is
-# zulip::voyager for an all-in-one system or zulip::dockervoyager for
-# Docker.  Use e.g. zulip::app_frontend for a Zulip frontend server.
-PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}"
-
-# First, install any updates from the apt repo that may be needed
-wget -qO - https://zulip.com/dist/keys/zulip-ppa.asc | apt-key add -
-cat >/etc/apt/sources.list.d/zulip.list <<EOF
-deb http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main
-deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main
-EOF
-
-apt-get update
-apt-get -y dist-upgrade $APT_OPTIONS
-apt-get install -y puppet git python $ADDITIONAL_PACKAGES
-
-mkdir -p /etc/zulip
-echo -e "[machine]\npuppet_classes = $PUPPET_CLASSES\ndeploy_type = $DEPLOYMENT_TYPE" > /etc/zulip/zulip.conf
-/root/zulip/scripts/zulip-puppet-apply -f
-
-# These server restarting bits should be moveable into puppet-land, ideally
-apt-get -y upgrade
-# Don't start services when deploying in docker aka dockervoyager
-if [ "$DEPLOYMENT_TYPE" = "voyager" ]; then
-    if [ -e "/etc/init.d/nginx" ]; then
-        # Check nginx was configured properly now that we've installed it.
-        # Most common failure mode is certs not having been installed.
-        nginx -t
-        service nginx restart
-    fi
-    /root/zulip/scripts/setup/generate_secrets.py
-    if ! rabbitmqctl status >/dev/null; then
-        set +x
-        echo; echo "RabbitMQ seems to not have started properly after the installation process."
-        echo "Often, this can be caused by misconfigured /etc/hosts in virtualized environments"
-        echo "See https://github.com/zulip/zulip/issues/53#issuecomment-143805121"
-        echo "for more information"
-        echo
-        set -x
-        exit 1
-    fi
-fi
-cp -a /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py
-ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py
-if [ "$DEPLOYMENT_TYPE" = "voyager" ]; then
-    # Configure rabbitmq
-    /root/zulip/scripts/setup/configure-rabbitmq
-    # Init postgres database
-    /root/zulip/scripts/setup/postgres-init-db
-else
-    echo; echo "Skipping rabbitmq configure and postgres init, because DEPLOYMENT_TYPE is not 'voyager', is '$DEPLOYMENT_TYPE'."
-fi
-
-deploy_path=$(/root/zulip/zulip_tools.py make_deploy_path)
-mv /root/zulip "$deploy_path"
-ln -nsf /home/zulip/deployments/next /root/zulip
-ln -nsf "$deploy_path" /home/zulip/deployments/next
-ln -nsf "$deploy_path" /home/zulip/deployments/current
-ln -nsf /etc/zulip/settings.py "$deploy_path"/zproject/local_settings.py
-mkdir -p "$deploy_path"/prod-static/serve
-cp -rT "$deploy_path"/prod-static/serve /home/zulip/prod-static
-chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py
-if [ -e "/var/run/supervisor.sock" ]; then
-    # If supervisor isn't running, no need to chown its socket
-    chown zulip:zulip /var/run/supervisor.sock
-fi
-
-cd /home/zulip/deployments/current
-
-set +x
-cat <<EOF
-
- Installation complete!
-
- Now edit /etc/zulip/settings.py and fill in the mandatory values.
-
- Once you've done that, please run:
-
- su zulip -c /home/zulip/deployments/current/scripts/setup/initialize-database
-
- To configure the initial database.
-EOF

docker-compose.yml

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

kubernetes/zulip-rc.yml

@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: zulip-v1.4.1
+  name: zulip-v1.4.1-1
   labels:
-    version: v1.4.1
+    version: v1.4.1-1
     app: zulip
 spec:
   replicas: 1
   selector:
-    version: v1.4.1
+    version: v1.4.1-1
     app: zulip
   template:
     metadata:
       labels:
-        version: v1.4.1
+        version: v1.4.1-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.4.1
+        image: quay.io/galexrt/zulip:v1.4.1-1
         resources:
           limits:
             cpu: 100m