From aa60fbb27406f06821ea687de0041966752d9421 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Thu, 14 Jan 2016 15:15:17 +0100 Subject: [PATCH] Updated to new version --- Dockerfile | 2 +- README.md | 4 +++- docker-compose.yml | 2 +- kubernetes/zulip-rc.yml | 10 +++++----- scripts/docker_start.sh | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15bdef4..aeaebdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/sameersbn/ubuntu:latest MAINTAINER Alexander Trost -ENV ZULIP_VERSION="1.3.9" DATA_DIR="/data" +ENV ZULIP_VERSION="1.3.9-1" DATA_DIR="/data" ADD entrypoint.sh /entrypoint.sh ADD puppet/zulip/ /root/puppet-zulip diff --git a/README.md b/README.md index 707752b..b2a6e85 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,9 @@ 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:v1.3.9` +`docker pull quay.io/galexrt/zulip:v1.3.9-1` +or +`docker pull galexrt/zulip:v1.3.9-1` ### For the latest development image changes use: `docker pull quay.io/galexrt/zulip:dev` diff --git a/docker-compose.yml b/docker-compose.yml index f29386b..6dee9b7 100644 --- a/docker-compose.yml +++ b/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.9" + image: "quay.io/galexrt/zulip:v1.3.9-1" ports: - "80:80" - "443:443" diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml index e1dd885..e494fa6 100644 --- a/kubernetes/zulip-rc.yml +++ b/kubernetes/zulip-rc.yml @@ -1,20 +1,20 @@ apiVersion: v1 kind: ReplicationController metadata: - name: zulip-v1.3.9 + name: zulip-v1.3.9-1 namespace: default labels: - version: v1.3.9 + version: v1.3.9-1 app: zulip spec: replicas: 1 selector: - version: v1.3.9 + version: v1.3.9-1 app: gitlab template: metadata: labels: - version: v1.3.9 + version: v1.3.9-1 app: gitlab spec: containers: @@ -60,7 +60,7 @@ spec: - name: postgresql-persistent-storage mountPath: /var/lib/postgresql - name: zulip - image: quay.io/galexrt/zulip:v1.3.9 + image: quay.io/galexrt/zulip:v1.3.9-1 resources: limits: cpu: 100m diff --git a/scripts/docker_start.sh b/scripts/docker_start.sh index 4a07845..549c7de 100644 --- a/scripts/docker_start.sh +++ b/scripts/docker_start.sh @@ -59,4 +59,4 @@ docker run \ -e "ZULIP_SETTINGS_DEFAULT_FROM_EMAIL=Zulip " \ -e "ZULIP_SETTINGS_EMAIL_HOST=smtp.example.com" \ -e "ZULIP_SETTINGS_EMAIL_HOST_USER=noreply@example.com" \ - quay.io/galexrt/zulip:v1.3.9 + quay.io/galexrt/zulip:v1.3.9-1