Pushed to new version

Added fixed supervisor puppet manifest

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: `1.4.2-2`
+Current Version: `1.4.2-3`
 
 ***
 
@@ -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:1.4.2-2`
+`docker pull quay.io/galexrt/zulip:1.4.2-3`
 or
-`docker pull galexrt/zulip:1.4.2-2`
+`docker pull galexrt/zulip:1.4.2-3`
 
 ### For the latest development image run
 `docker pull quay.io/galexrt/zulip:dev`

custom_zulip_files/puppet/zulip/manifests/supervisor.pp

@@ -4,6 +4,33 @@ class zulip::supervisor {
                           ]
   package { $supervisor_packages: ensure => "installed" }
 
+  service { "supervisor":
+    ensure     => running,
+    require    => [File["/var/log/zulip"],
+                Package["supervisor"],
+                ],
+
+    hasstatus  => true,
+    status     => "/bin/true",
+    start      => "/bin/true",
+
+    # The "restart" option in the init script does not work.  We could
+    # tell Puppet to fall back to stop/start, which does work, but the
+    # better option is to tell supervisord to reread its config via
+    # supervisorctl and then to "update".  You need to do both --
+    # after a "reread", supervisor won't actually take actual based on
+    # the changed configuration until you do an "update" (I assume
+    # this is so you can check if your config file parses without
+    # doing anything, but it's really confusing)
+    #
+    # Also, to handle the case that supervisord wasn't running at all,
+    # we check if it is not running and if so, start it.
+    #
+    # We use supervisor[d] as the pattern so the bash/grep commands don't match.
+    hasrestart => false,
+    restart    => "/bin/true",
+  }
+
   file { "/etc/supervisor/supervisord.conf":
     require => Package[supervisor],
     ensure => file,
@@ -11,6 +38,7 @@ class zulip::supervisor {
     group => "root",
     mode => 644,
     source => "puppet:///modules/zulip/supervisor/supervisord.conf",
+    notify => Service["supervisor"],
   }
 
   if $zulip::base::release_name == "xenial" {

docker-compose.yml

@@ -23,7 +23,7 @@ services:
     volumes:
       - "/opt/docker/zulip/redis:/var/lib/redis:rw"
   zulip:
-    image: "quay.io/galexrt/zulip:1.4.2-2"
+    image: "quay.io/galexrt/zulip:1.4.2-3"
     ports:
       - "80:80"
       - "443:443"

kubernetes/zulip-rc.yml

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