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

Add zulip ppa in Dockerfile again

Browse Source 
Changed version tags 1.3.7 to 1.3.7-1
This commit is contained in:
Alexander Trost
2015-10-25 02:32:13 +02:00
parent a613bf1d1a
commit 38cafa29a4
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -6,8 +6,12 @@ ENV ZULIP_VERSION="1.3.7" ZULIP_CHECKSUM="88bfa668eb14e07b0b806977db2ae2cd4d7e7e
ADD entrypoint.sh /entrypoint.sh ADD entrypoint.sh /entrypoint.sh
ADD zulip-puppet /root/zulip-puppet ADD zulip-puppet /root/zulip-puppet
RUN apt-get -qq update -q && \ RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc && \
apt-get -qq dist-upgrade -y && \ apt-key add /root/zulip-ppa.asc && \
echo "deb http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main" > /etc/apt/sources.list.d/zulip.list && \
echo "deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu trusty main" >> /etc/apt/sources.list.d/zulip.list && \
apt-get -qq update && \
apt-get -q dist-upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get -q install -y puppet tar git openssl python-dev python-six python-pbs && \ DEBIAN_FRONTEND=noninteractive apt-get -q install -y puppet tar git openssl python-dev python-six python-pbs && \
mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \ mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \
wget -q "https://www.zulip.com/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -P "/tmp" && \ wget -q "https://www.zulip.com/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -P "/tmp" && \

2
README.md
View File

@@ -23,7 +23,7 @@ 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:1.3.7` `docker pull quay.io/galexrt/zulip:1.3.7-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`

2
docker-compose.yml
View File

@@ -25,7 +25,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.7" image: "quay.io/galexrt/zulip:v1.3.7-1"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"

10
kubernetes/zulip-rc.yml
View File

@@ -1,20 +1,20 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: zulip-v1.3.7 name: zulip-v1.3.7-1
namespace: default namespace: default
labels: labels:
version: v1.3.7 version: v1.3.7-1
app: zulip app: zulip
spec: spec:
replicas: 1 replicas: 1
selector: selector:
version: v1.3.7 version: v1.3.7-1
app: gitlab app: gitlab
template: template:
metadata: metadata:
labels: labels:
version: v1.3.7 version: v1.3.7-1
app: gitlab app: gitlab
spec: spec:
containers: containers:
@@ -66,7 +66,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.3.7 image: quay.io/galexrt/zulip:1.3.7-1
resources: resources:
limits: limits:
cpu: 100m cpu: 100m

2
scripts/docker_start.sh
View File

@@ -65,4 +65,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:1.3.7 quay.io/galexrt/zulip:1.3.7-1

2
zulip-puppet/manifests/voyager.pp
View File

@@ -10,7 +10,7 @@ class zulip::voyager {
key => '84C2BE60E50E336456E4749CE84240474E26AE47', key => '84C2BE60E50E336456E4749CE84240474E26AE47',
key_source => 'https://zulip.com/dist/keys/zulip.asc', key_source => 'https://zulip.com/dist/keys/zulip.asc',
pin => '995', pin => '995',
include_src => false, include_src => true,
} }
file { "/etc/nginx/sites-available/zulip-enterprise": file { "/etc/nginx/sites-available/zulip-enterprise":