Updated to new version

This commit is contained in:
Alexander Trost
2016-01-14 15:15:17 +01:00
parent ecce1bdb05
commit aa60fbb274
5 changed files with 11 additions and 9 deletions

View File

@@ -1,7 +1,7 @@
FROM quay.io/sameersbn/ubuntu:latest FROM quay.io/sameersbn/ubuntu:latest
MAINTAINER Alexander Trost <galexrt@googlemail.com> MAINTAINER Alexander Trost <galexrt@googlemail.com>
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 entrypoint.sh /entrypoint.sh
ADD puppet/zulip/ /root/puppet-zulip ADD puppet/zulip/ /root/puppet-zulip

View File

@@ -23,7 +23,9 @@ See the [Configuration](https://github.com/Galexrt/docker-zulip/wiki/Configurati
## How to get the container: ## How to get the container:
### For docker use: ### 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: ### For the latest development image changes use:
`docker pull quay.io/galexrt/zulip:dev` `docker pull quay.io/galexrt/zulip:dev`

View File

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

View File

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

View File

@@ -59,4 +59,4 @@ docker run \
-e "ZULIP_SETTINGS_DEFAULT_FROM_EMAIL=Zulip <noreply@example.com>" \ -e "ZULIP_SETTINGS_DEFAULT_FROM_EMAIL=Zulip <noreply@example.com>" \
-e "ZULIP_SETTINGS_EMAIL_HOST=smtp.example.com" \ -e "ZULIP_SETTINGS_EMAIL_HOST=smtp.example.com" \
-e "ZULIP_SETTINGS_EMAIL_HOST_USER=noreply@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