From f27aaaf8f482d9c38799c9bf18d28cc38a5e8bf2 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 14 Sep 2016 15:02:26 +0200 Subject: [PATCH 1/2] Fixed the build error --- custom_zulip_files/scripts/lib/install | 93 -------------------------- 1 file changed, 93 deletions(-) delete mode 100755 custom_zulip_files/scripts/lib/install diff --git a/custom_zulip_files/scripts/lib/install b/custom_zulip_files/scripts/lib/install deleted file mode 100755 index c99c983..0000000 --- a/custom_zulip_files/scripts/lib/install +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash -set -xe - -# Assumes we've already been untarred - -# Specify options for apt. -APT_OPTIONS="${APT_OPTIONS:-}" -# Install additional packages using apt. -ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES:-} -# Deployment type is almost always voyager. -DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}" -# Comma-separated list of puppet manifests to install. default is -# zulip::voyager for an all-in-one system or zulip::dockervoyager for -# Docker. Use e.g. zulip::app_frontend for a Zulip frontend server. -PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}" - -# First, install any updates from the apt repo that may be needed -wget -qO - https://zulip.com/dist/keys/zulip-ppa.asc | apt-key add - -cat >/etc/apt/sources.list.d/zulip.list < /etc/zulip/zulip.conf -/root/zulip/scripts/zulip-puppet-apply -f - -# These server restarting bits should be moveable into puppet-land, ideally -apt-get -y upgrade -# Don't start services when deploying in docker aka dockervoyager -if [ "$DEPLOYMENT_TYPE" = "voyager" ]; then - if [ -e "/etc/init.d/nginx" ]; then - # Check nginx was configured properly now that we've installed it. - # Most common failure mode is certs not having been installed. - nginx -t - service nginx restart - fi - /root/zulip/scripts/setup/generate_secrets.py - if ! rabbitmqctl status >/dev/null; then - set +x - echo; echo "RabbitMQ seems to not have started properly after the installation process." - echo "Often, this can be caused by misconfigured /etc/hosts in virtualized environments" - echo "See https://github.com/zulip/zulip/issues/53#issuecomment-143805121" - echo "for more information" - echo - set -x - exit 1 - fi -fi -cp -a /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py -ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py -if [ "$DEPLOYMENT_TYPE" = "voyager" ]; then - # Configure rabbitmq - /root/zulip/scripts/setup/configure-rabbitmq - # Init postgres database - /root/zulip/scripts/setup/postgres-init-db -else - echo; echo "Skipping rabbitmq configure and postgres init, because DEPLOYMENT_TYPE is not 'voyager', is '$DEPLOYMENT_TYPE'." -fi - -deploy_path=$(/root/zulip/zulip_tools.py make_deploy_path) -mv /root/zulip "$deploy_path" -ln -nsf /home/zulip/deployments/next /root/zulip -ln -nsf "$deploy_path" /home/zulip/deployments/next -ln -nsf "$deploy_path" /home/zulip/deployments/current -ln -nsf /etc/zulip/settings.py "$deploy_path"/zproject/local_settings.py -mkdir -p "$deploy_path"/prod-static/serve -cp -rT "$deploy_path"/prod-static/serve /home/zulip/prod-static -chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py -if [ -e "/var/run/supervisor.sock" ]; then - # If supervisor isn't running, no need to chown its socket - chown zulip:zulip /var/run/supervisor.sock -fi - -cd /home/zulip/deployments/current - -set +x -cat < Date: Wed, 14 Sep 2016 15:07:20 +0200 Subject: [PATCH 2/2] Update image version to 1.4.1-1 for new release --- README.md | 6 +++--- docker-compose.yml | 2 +- kubernetes/zulip-rc.yml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 376ae74..232ad06 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ * [**Quay.io**](https://quay.io/repository/galexrt/zulip) * [**Docker Hub**](https://hub.docker.com/r/galexrt/zulip) -Current Version: `v1.4.1` +Current Version: `v1.4.1-1` *** @@ -25,9 +25,9 @@ See the [Configuration](https://github.com/Galexrt/docker-zulip/wiki/Configurati ## How to get the container running ### To pull the image run -`docker pull quay.io/galexrt/zulip:v1.4.1` +`docker pull quay.io/galexrt/zulip:v1.4.1-1` or -`docker pull galexrt/zulip:v1.4.1` +`docker pull galexrt/zulip:v1.4.1-1` ### For the latest development image run `docker pull quay.io/galexrt/zulip:dev` diff --git a/docker-compose.yml b/docker-compose.yml index eb63e32..247b1a4 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.4.1" + image: "quay.io/galexrt/zulip:v1.4.1-1" ports: - "80:80" - "443:443" diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml index 3aa03fb..16d717b 100644 --- a/kubernetes/zulip-rc.yml +++ b/kubernetes/zulip-rc.yml @@ -1,19 +1,19 @@ apiVersion: v1 kind: ReplicationController metadata: - name: zulip-v1.4.1 + name: zulip-v1.4.1-1 labels: - version: v1.4.1 + version: v1.4.1-1 app: zulip spec: replicas: 1 selector: - version: v1.4.1 + version: v1.4.1-1 app: zulip template: metadata: labels: - version: v1.4.1 + version: v1.4.1-1 app: zulip spec: containers: @@ -59,7 +59,7 @@ spec: - name: postgresql-persistent-storage mountPath: /var/lib/postgresql - name: zulip - image: quay.io/galexrt/zulip:v1.4.1 + image: quay.io/galexrt/zulip:v1.4.1-1 resources: limits: cpu: 100m