Clean up the env vars

Fixed the checksum fail during build.
2025-11-02 21:13:41 +00:00 · 2015-10-21 14:47:46 +02:00
parent dae17c8d74
commit ca3eeec66b
6 changed files with 28 additions and 30 deletions
--- a/18
+++ b/18
@@ -1,13 +1,13 @@
 FROM quay.io/sameersbn/ubuntu:14.04.20151013
 MAINTAINER Alexander Trost <galexrt@googlemail.com>

-ENV ZULIP_DIR="/home/zulip" ZULIP_VERSION="1.3.7" ZULIP_CHECKSUM="88bfa668eb14e07b0b806977db2ae2cd4d7e7ef8" DATA_DIR="/data" \
-    DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASSWORD="zulip" DB_NAME="zulip" \
+ENV ZULIP_VERSION="1.3.7" ZULIP_CHECKSUM="88bfa668eb14e07b0b806977db2ae2cd4d7e7ef8" DATA_DIR="/data" \
+    DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASS="zulip" DB_NAME="zulip" \
    RABBITMQ_HOST="127.0.0.1" RABBITMQ_USERNAME="zulip" RABBITMQ_PASSWORD="zulip"\
    REDIS_RATE_LIMITING="True" REDIS_HOST="127.0.0.1" REDIS_PORT="6379" \
    MEMCACHED_HOST="127.0.0.1" MEMCACHED_PORT="11211" MEMCACHED_TIMEOUT="3600" \
-    ZULIP_USER_FULLNAME="Zulip Docker" ZULIP_USER_DOMAIN="" ZULIP_USER_EMAIL="" ZULIP_USER_PASSWORD="zulip" \
-    ZULIP_CUSTOM_SETTINGS="" ZULIP_AUTO_GENERATE_CERTS="True" ZULIP_CERTIFICATE_SUBJ=""
+    ZULIP_USER_FULLNAME="Zulip Docker" ZULIP_USER_DOMAIN="" ZULIP_USER_EMAIL="" ZULIP_USER_PASS="zulip" \
+    ZULIP_CUSTOM_SETTINGS="" ZULIP_AUTO_GENERATE_CERTS="True"

 ADD entrypoint.sh /entrypoint.sh
 ADD zulip-puppet /root/zulip-puppet
@@ -22,7 +22,7 @@ RUN apt-get -qq update -q && \
    apt-get -qq dist-upgrade -y && \
    mkdir -p "/root/zulip" "/etc/zulip" "$DATA_DIR" && \
    wget -q "https://www.zulip.com/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -P "/tmp" && \
-    echo "$ZULIP_CHECKSUM zulip-server-$ZULIP_VERSION.tar.gz" | sha1sum -c && \
+    echo "$ZULIP_CHECKSUM /tmp/zulip-server-$ZULIP_VERSION.tar.gz" | sha1sum -c && \
    tar xfz "/tmp/zulip-server-$ZULIP_VERSION.tar.gz" -C "/root/zulip" --remove-files --strip-components=1 && \
    echo "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf && \
    rm -rf /root/zulip/puppet/zulip_internal /root/zulip/puppet/zulip && \
@@ -32,11 +32,11 @@ RUN apt-get -qq update -q && \
    ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \
    ZULIP_DEPLOY_PATH=$(/root/zulip/zulip_tools.py make_deploy_path) && \
    mv /root/zulip "$ZULIP_DEPLOY_PATH" && \
-    ln -nsf "$ZULIP_DIR/deployments/next" /root/zulip && \
-    ln -nsf "$ZULIP_DEPLOY_PATH" "$ZULIP_DIR/deployments/next" && \
-    ln -nsf "$ZULIP_DEPLOY_PATH" "$ZULIP_DIR/deployments/current" && \
+    ln -nsf "/home/zulip/deployments/next" /root/zulip && \
+    ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/next" && \
+    ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/current" && \
    ln -nsf /etc/zulip/settings.py "$ZULIP_DEPLOY_PATH/zproject/local_settings.py" && \
-    cp -rfT "$ZULIP_DEPLOY_PATH/prod-static/serve" "$ZULIP_DIR/prod-static" && \
+    cp -rfT "$ZULIP_DEPLOY_PATH/prod-static/serve" "/home/zulip/prod-static" && \
    chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py && \
    apt-get -qq autoremove --purge -y && \
    apt-get -qq clean && \
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,11 +41,10 @@ zulip:
    REDIS_HOST: "redis"
    RABBITMQ_HOST: "rabbitmq"
    ZULIP_USER_EMAIL: "example@example.com"
-    ZULIP_USER_PASSWORD: "zulip"
+    ZULIP_USER_PASS: "zulip"
    ZULIP_USER_DOMAIN: "example.com"
-    ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend: "EmailAuthBackend"
+    ZULIP_AUTH_BACKENDS_EmailAuthBackend: "EmailAuthBackend"
    ZULIP_SECRETS_email_password: "12345"
-    ZULIP_SECRETS_rabbitmq_password: "zulip"
    ZULIP_SETTINGS_EXTERNAL_HOST: "example.com"
    ZULIP_SETTINGS_ZULIP_ADMINISTRATOR: "admin@example.com"
    ZULIP_SETTINGS_ADMIN_DOMAIN: "example.com"
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,7 +6,7 @@ if [ "$DEBUG" == "true" ]; then
 fi
 set -e

-ZULIP_CURRENT_DEPLOY="$ZULIP_DIR/deployments/current"
+ZULIP_CURRENT_DEPLOY="/home/zulip/deployments/current"
 ZULIP_SETTINGS="/etc/zulip/settings.py"
 ZULIP_ZPROJECT_SETTINGS="$ZULIP_CURRENT_DEPLOY/zproject/settings.py"

@@ -31,8 +31,8 @@ databaseSetup(){
        echo "No DB_USER given."
        exit 2
    fi
-    if [ -z "$DB_PASSWORD" ]; then
-        echo "No DB_PASSWORD given."
+    if [ -z "$DB_PASS" ]; then
+        echo "No DB_PASS given."
        exit 2
    fi
    cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
@@ -45,7 +45,7 @@ DATABASES = {
    'ENGINE': 'django.db.backends.postgresql_psycopg2',
    'NAME': '$DB_NAME',
    'USER': '$DB_USER',
-    'PASSWORD': '$DB_PASSWORD',
+    'PASSWORD': '$DB_PASS',
    'HOST': '$DB_HOST',
    'SCHEMA': 'zulip',
    'CONN_MAX_AGE': 600,
@@ -57,7 +57,7 @@ DATABASES = {
 }
 EOF
    if [ -z "$PGPASSWORD" ]; then
-        export PGPASSWORD="$DB_PASSWORD"
+        export PGPASSWORD="$DB_PASS"
    fi
    if [ -z "$DB_PORT" ]; then
        export DB_PORT="5432"
@@ -74,7 +74,7 @@ EOF
        echo -n "."
        sleep 1
    done
-    sed -i "s~psycopg2.connect(\"user=zulip\")~psycopg2.connect(\"host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER password=$DB_PASSWORD\")~g" "/usr/local/bin/process_fts_updates"
+    sed -i "s~psycopg2.connect(\"user=zulip\")~psycopg2.connect(\"host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER password=$DB_PASS\")~g" "/usr/local/bin/process_fts_updates"
    echo """
    CREATE USER zulip;
    ALTER ROLE zulip SET search_path TO zulip,public;
@@ -83,6 +83,7 @@ EOF
    """ | psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" || :
    echo "CREATE EXTENSION tsearch_extras SCHEMA zulip;" | \
        psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "zulip" || :
+    unset PGPASSWORD
 }
 databaseInitiation(){
    echo "Migrating database ..."
@@ -200,7 +201,7 @@ EOF
        "EmailAuthBackend" "ZulipRemoteUserBackend" "GoogleMobileOauth2Backend" "ZulipLDAPAuthBackend"
    )
    for AUTH_BACKEND_KEY in "${POSSIBLE_AUTH_BACKENDS[@]}"; do
-        local KEY="ZULIP_AUTHENTICATION_BACKENDS_$AUTH_BACKEND_KEY"
+        local KEY="ZULIP_AUTH_BACKENDS_$AUTH_BACKEND_KEY"
        local AUTH_BACKEND_VAR="${!KEY}"
        if [ -z "$AUTH_BACKEND_VAR" ]; then
            echo "No authentication backend for key \"$AUTH_BACKEND_KEY\"."
@@ -283,7 +284,7 @@ EOF
        echo "No zulip user domain given."
        return 1
    fi
-    if [ -z "$ZULIP_USER_PASSWORD" ]; then
+    if [ -z "$ZULIP_USER_PASS" ]; then
        echo "No zulip user password given."
        return 1
    fi
@@ -312,16 +313,16 @@ case "$1" in
    ;;
 esac

-if [ ! -d "$ZULIP_DIR/uploads" ]; then
-    mkdir -p "$ZULIP_DIR/uploads"
+if [ ! -d "/home/zulip/uploads" ]; then
+    mkdir -p "/home/zulip/uploads"
 fi
 if [ -d "$DATA_DIR/uploads" ]; then
-    rm -rf "$ZULIP_DIR/uploads"
+    rm -rf "/home/zulip/uploads"
 else
    mkdir -p "$DATA_DIR/uploads"
-    mv -f "$ZULIP_DIR/uploads" "$DATA_DIR/uploads"
+    mv -f "/home/zulip/uploads" "$DATA_DIR/uploads"
 fi
-ln -sfT "$DATA_DIR/uploads" "$ZULIP_DIR/uploads"
+ln -sfT "$DATA_DIR/uploads" "/home/zulip/uploads"
 chown zulip:zulip -R "$DATA_DIR/uploads"
 # Configure rabbitmq server everytime because it could be a new one ;)
 rabbitmqSetup
--- a/kubernetes/zulip-rc.yml
+++ b/kubernetes/zulip-rc.yml
@@ -84,12 +84,10 @@ spec:
          value: "example@example.com"
        - name: ZULIP_USER_DOMAIN
          value: "example.com"
-        - name: ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend
+        - name: ZULIP_AUTH_BACKENDS_EmailAuthBackend
          value: "EmailAuthBackend"
        - name: ZULIP_SECRETS_email_password
          value: "12345"
-        - name: ZULIP_SECRETS_rabbitmq_password
-          value:"zulip"
        - name: ZULIP_SETTINGS_EXTERNAL_HOST
          value: "localhost"
        - name: ZULIP_SETTINGS_ZULIP_ADMINISTRATOR
--- a/scripts/docker_start.sh
+++ b/scripts/docker_start.sh
@@ -49,7 +49,7 @@ docker run \
    -e "RABBITMQ_HOST=rabbitmq" \
    -e "ZULIP_USER_EMAIL=example@example.com" \
    -e "ZULIP_USER_DOMAIN=example.com" \
-    -e "ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend=EmailAuthBackend" \
+    -e "ZULIP_AUTH_BACKENDS_EmailAuthBackend=EmailAuthBackend" \
    -e "ZULIP_SECRETS_email_password=12345" \
    -e "ZULIP_SECRETS_rabbitmq_password=zulip" \
    -e "ZULIP_SETTINGS_EXTERNAL_HOST=example.com" \
--- a/zulip-puppet/files/setupZulipUser.sh
+++ b/zulip-puppet/files/setupZulipUser.sh
@@ -5,7 +5,7 @@
 /home/zulip/deployments/current/manage.py shell <<EOF
 from zerver.decorator import get_user_profile_by_email
 User = get_user_profile_by_email('atrost@zerbytes.net')
-User.set_password('$ZULIP_USER_PASSWORD')
+User.set_password('$ZULIP_USER_PASS')
 User.save()
 EOF
 rm -rf /etc/supervisor/conf.d/zulip_postsetup.conf