paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-04 05:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing rabbitmqctl issue

Browse Source 
Update to version 1.5.1-3
This commit is contained in:
Alexander Trost
2017-03-17 15:07:40 +01:00
parent 79dd621bfa
commit d34803e91c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
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.5.1" DATA_DIR="/data" ENV ZULIP_VERSION="1.5.1-3" DATA_DIR="/data"
COPY custom_zulip_files/ /root/custom_zulip COPY custom_zulip_files/ /root/custom_zulip
@@ -14,7 +14,7 @@ RUN apt-get -q update && \
cp -rf /root/custom_zulip/* /root/zulip && \ cp -rf /root/custom_zulip/* /root/zulip && \
rm -rf /root/custom_zulip && \ rm -rf /root/custom_zulip && \
PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \ PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \
ADDITIONAL_PACKAGES="python-dev python-six python-pbs python-crypto expect" \ ADDITIONAL_PACKAGES="python-dev python-six python-pbs python-crypto rabbitmq-server expect" \
/root/zulip/scripts/setup/install && \ /root/zulip/scripts/setup/install && \
cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \ cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \ ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \

10
README.md
View File

@@ -8,8 +8,8 @@ Image available from:
* [**Quay.io**](https://quay.io/repository/galexrt/zulip) * [**Quay.io**](https://quay.io/repository/galexrt/zulip)
* [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip) * [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip)
Current Zulip version: `1.5.1` Current Zulip version: `1.5.1-3`
Current Docker image version: `1.5.1` Current Docker image version: `1.5.1-3`
*** ***
@@ -30,9 +30,9 @@ See the [Configuration](https://github.com/Galexrt/docker-zulip/wiki/Configurati
## How to get the container running ## How to get the container running
### To pull the image run ### To pull the image run
`docker pull quay.io/galexrt/zulip:1.5.1` `docker pull quay.io/galexrt/zulip:1.5.1-3`
or or
`docker pull galexrt/zulip:1.5.1` `docker pull galexrt/zulip:1.5.1-3`
### For the latest development image run ### For the latest development image run
`docker pull quay.io/galexrt/zulip:dev` `docker pull quay.io/galexrt/zulip:dev`
@@ -64,7 +64,7 @@ A Kubernetes pod file is in the `kubernetes/` folder. The command to run it woul
The main reason for this to happen is that you are missing a config file named `uwsgi.ini`. The main reason for this to happen is that you are missing a config file named `uwsgi.ini`.
The get this file run: The get this file run:
``` ```
host$ docker run -it quay.io/galexrt/zulip:1.5.1 bash host$ docker run -it quay.io/galexrt/zulip:1.5.1-3 bash
// In the container shell run // In the container shell run
container# cat /etc/zulip/uwsgi.ini container# cat /etc/zulip/uwsgi.ini
// Copy the output of this command into your data volume // Copy the output of this command into your data volume

8
docker-compose.yml
View File

@@ -23,10 +23,10 @@ services:
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:1.5.1" image: "quay.io/galexrt/zulip:1.5.1-2-3"
command: # command:
- sleep # - sleep
- "3600" # - "3600"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"

10
kubernetes/zulip-rc.yml
View File

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