Removed the camo container from docker-compose.yml, kubernetes rc and docker_start.sh

This commit is contained in:
Alexander Trost
2015-10-28 07:50:15 +01:00
parent dc2b2cbfd9
commit 239358d13b
3 changed files with 1 additions and 17 deletions

View File

@@ -16,9 +16,6 @@ rabbitmq:
environment: environment:
RABBITMQ_DEFAULT_USER: "zulip" RABBITMQ_DEFAULT_USER: "zulip"
RABBITMQ_DEFAULT_PASS: "zulip" RABBITMQ_DEFAULT_PASS: "zulip"
camo:
image: "quay.io/galexrt/camo:latest"
restart: always
redis: redis:
image: "quay.io/sameersbn/redis:latest" image: "quay.io/sameersbn/redis:latest"
volumes: volumes:
@@ -32,7 +29,6 @@ zulip:
- database - database
- memcached - memcached
- rabbitmq - rabbitmq
- camo
- redis - redis
environment: environment:
DB_HOST: "database" DB_HOST: "database"

View File

@@ -43,12 +43,6 @@ spec:
value: "zulip" value: "zulip"
- name: RABBITMQ_DEFAULT_PASS - name: RABBITMQ_DEFAULT_PASS
value: "zulip" value: "zulip"
- name: camo
image: quay.io/galexrt/camo:latest
resources:
limits:
cpu: 75m
memory: 512Mi
- name: postgresql - name: postgresql
image: quay.io/galexrt/zulip-postgresql-tsearchextras:latest image: quay.io/galexrt/zulip-postgresql-tsearchextras:latest
resources: resources:

View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
CONTAINERS=(zulip_database zulip_memcached zulip_rabbitmq zulip_camo zulip_redis zulip_zulip) CONTAINERS=(zulip_database zulip_memcached zulip_rabbitmq zulip_redis zulip_zulip)
for CONTAINER_NAME in $"${CONTAINERS[@]}"; for CONTAINER_NAME in $"${CONTAINERS[@]}";
do do
docker stop "$CONTAINER_NAME" docker stop "$CONTAINER_NAME"
@@ -27,11 +27,6 @@ docker run \
-e "RABBITMQ_DEFAULT_USER=zulip" \ -e "RABBITMQ_DEFAULT_USER=zulip" \
-e "RABBITMQ_DEFAULT_PASS=zulip" \ -e "RABBITMQ_DEFAULT_PASS=zulip" \
docker.io/rabbitmq:3.5.5 docker.io/rabbitmq:3.5.5
docker run \
-d \
--name=zulip_camo \
--restart=always \
quay.io/galexrt/camo:latest
docker run \ docker run \
-d \ -d \
--name=zulip_redis \ --name=zulip_redis \
@@ -44,7 +39,6 @@ docker run \
--link=zulip_database:database \ --link=zulip_database:database \
--link=zulip_memcached:memcached \ --link=zulip_memcached:memcached \
--link=zulip_rabbitmq:rabbitmq \ --link=zulip_rabbitmq:rabbitmq \
--link=zulip_camo:camo \
--link=zulip_redis:redis \ --link=zulip_redis:redis \
-p 80:80 \ -p 80:80 \
-p 443:443 \ -p 443:443 \