From 9a889f61c7b83834a37bf44fe2d0308fb562f3ba Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Tue, 30 Jul 2019 00:48:37 +0200
Subject: [docker] Download IHM from Pypy or reference git repo;

This creates two modes to run the Docker image:
- either in non-NIGHTLY mode, the latest version will be installed from
pypy.
- or in Nightly mode, it will clone the repository and update it every
time the instance is restarted.

It also updates Python to 3.7, for additional goodness.
---
 conf/confandrun.sh | 24 ------------------------
 conf/entrypoint.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 24 deletions(-)
 delete mode 100755 conf/confandrun.sh
 create mode 100755 conf/entrypoint.sh

(limited to 'conf')

diff --git a/conf/confandrun.sh b/conf/confandrun.sh
deleted file mode 100755
index b08bf97..0000000
--- a/conf/confandrun.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-cat <<EOF > /etc/ihatemoney/ihatemoney.cfg
-DEBUG = $DEBUG
-SQLALCHEMY_DATABASE_URI = "$SQLALCHEMY_DATABASE_URI"
-SQLACHEMY_DEBUG = DEBUG
-SQLALCHEMY_TRACK_MODIFICATIONS = $SQLALCHEMY_TRACK_MODIFICATIONS
-SECRET_KEY = "$SECRET_KEY"
-MAIL_SERVER = "$MAIL_SERVER"
-MAIL_PORT = $MAIL_PORT
-MAIL_USE_TLS = $MAIL_USE_TLS
-MAIL_USE_SSL = $MAIL_USE_SSL
-MAIL_USERNAME = "$MAIL_USERNAME"
-MAIL_PASSWORD = "$MAIL_PASSWORD"
-MAIL_DEFAULT_SENDER = "$MAIL_DEFAULT_SENDER"
-ACTIVATE_DEMO_PROJECT = $ACTIVATE_DEMO_PROJECT
-ADMIN_PASSWORD = '$ADMIN_PASSWORD'
-ALLOW_PUBLIC_PROJECT_CREATION = $ALLOW_PUBLIC_PROJECT_CREATION
-ACTIVATE_ADMIN_DASHBOARD = $ACTIVATE_ADMIN_DASHBOARD
-EOF
-# Start gunicorn without forking
-exec gunicorn ihatemoney.wsgi:application \
-     -b 0.0.0.0:8000 \
-     --log-syslog \
-     "$@"
diff --git a/conf/entrypoint.sh b/conf/entrypoint.sh
new file mode 100755
index 0000000..07dcc63
--- /dev/null
+++ b/conf/entrypoint.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Fail the whole script on the first failure.
+set -e
+
+cat <<EOF > /etc/ihatemoney/ihatemoney.cfg
+DEBUG = $DEBUG
+SQLALCHEMY_DATABASE_URI = "$SQLALCHEMY_DATABASE_URI"
+SQLACHEMY_DEBUG = DEBUG
+SQLALCHEMY_TRACK_MODIFICATIONS = $SQLALCHEMY_TRACK_MODIFICATIONS
+SECRET_KEY = "$SECRET_KEY"
+MAIL_SERVER = "$MAIL_SERVER"
+MAIL_PORT = $MAIL_PORT
+MAIL_USE_TLS = $MAIL_USE_TLS
+MAIL_USE_SSL = $MAIL_USE_SSL
+MAIL_USERNAME = "$MAIL_USERNAME"
+MAIL_PASSWORD = "$MAIL_PASSWORD"
+MAIL_DEFAULT_SENDER = "$MAIL_DEFAULT_SENDER"
+ACTIVATE_DEMO_PROJECT = $ACTIVATE_DEMO_PROJECT
+ADMIN_PASSWORD = '$ADMIN_PASSWORD'
+ALLOW_PUBLIC_PROJECT_CREATION = $ALLOW_PUBLIC_PROJECT_CREATION
+ACTIVATE_ADMIN_DASHBOARD = $ACTIVATE_ADMIN_DASHBOARD
+EOF
+
+if [ ! -z "$NIGHTLY" ]; then
+    # Clone or update repository into /ihatemoney.
+    if [ ! -d /ihatemoney/.git ]; then
+        echo "Cloning..."
+        git clone --depth 1 https://github.com/spiral-project/ihatemoney /ihatemoney
+        echo "Done cloning."
+    else
+        cd /ihatemoney
+        echo "Updating..."
+        git pull || echo "Couldn't update; maybe Github is unreachable?"
+        echo "Done updating."
+    fi
+    pip install --no-cache-dir -e /ihatemoney
+else
+    # Get the latest release from PyPy.
+    pip install --no-cache-dir --upgrade ihatemoney
+fi
+
+# Start gunicorn without forking
+exec gunicorn ihatemoney.wsgi:application \
+     -b 0.0.0.0:8000 \
+     --log-syslog \
+     "$@"
-- 
cgit v1.1