From fd6ba459f928d110d796cd464b16f47f97dc0f53 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 19 Jan 2020 15:51:47 +0000
Subject: Add Gitlab CI support

---
 utils/bash.sh             |  2 +-
 utils/create_migration.sh |  6 +++---
 utils/db.sh               |  2 +-
 utils/gitlabci/config.cfg | 31 +++++++++++++++++++++++++++++++
 utils/gitlabci/config.env |  4 ++++
 utils/reload.sh           |  4 ++--
 utils/run_migrations.sh   |  4 ++--
 utils/tests.sh            |  4 ++--
 8 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 utils/gitlabci/config.cfg
 create mode 100644 utils/gitlabci/config.env

(limited to 'utils')

diff --git a/utils/bash.sh b/utils/bash.sh
index 8a3c6a0..e39e062 100755
--- a/utils/bash.sh
+++ b/utils/bash.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Open SSH to app instance
 
diff --git a/utils/create_migration.sh b/utils/create_migration.sh
index 910344c..4c73937 100755
--- a/utils/create_migration.sh
+++ b/utils/create_migration.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 # Create a database migration, and copy it back to the host.
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db migrate"
-docker exec -u root -it contentdb_app_1 sh -c "cp /home/cdb/migrations/versions/* /source/migrations/versions/"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db migrate"
+docker exec -u root contentdb_app_1 sh -c "cp /home/cdb/migrations/versions/* /source/migrations/versions/"
 
 USER=$(whoami)
 sudo chown -R $USER:$USER migrations/versions
diff --git a/utils/db.sh b/utils/db.sh
index f7f6af2..1ad5cc8 100755
--- a/utils/db.sh
+++ b/utils/db.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Open SQL console for the database
 
diff --git a/utils/gitlabci/config.cfg b/utils/gitlabci/config.cfg
new file mode 100644
index 0000000..b34934f
--- /dev/null
+++ b/utils/gitlabci/config.cfg
@@ -0,0 +1,31 @@
+USER_APP_NAME="Content DB"
+SERVER_NAME="localhost:5123"
+BASE_URL="http://" + SERVER_NAME
+
+SECRET_KEY="changeme"
+WTF_CSRF_SECRET_KEY="changeme"
+
+SQLALCHEMY_DATABASE_URI = "postgres://contentdb:password@db:5432/contentdb"
+
+GITHUB_CLIENT_ID = ""
+GITHUB_CLIENT_SECRET = ""
+
+REDIS_URL='redis://redis:6379'
+CELERY_BROKER_URL='redis://redis:6379'
+CELERY_RESULT_BACKEND='redis://redis:6379'
+
+USER_ENABLE_USERNAME = True
+USER_ENABLE_REGISTER = False
+USER_ENABLE_CHANGE_USERNAME = False
+USER_ENABLE_EMAIL = False
+
+MAIL_UTILS_ERROR_SEND_TO = [""]
+
+UPLOAD_DIR="/var/cdb/uploads/"
+THUMBNAIL_DIR="/var/cdb/thumbnails/"
+
+TEMPLATES_AUTO_RELOAD = True
+
+LANGUAGES = {
+    'en': 'English',
+}
diff --git a/utils/gitlabci/config.env b/utils/gitlabci/config.env
new file mode 100644
index 0000000..925271c
--- /dev/null
+++ b/utils/gitlabci/config.env
@@ -0,0 +1,4 @@
+POSTGRES_USER=contentdb
+POSTGRES_PASSWORD=password
+POSTGRES_DB=contentdb
+FLASK_DEBUG=1
diff --git a/utils/reload.sh b/utils/reload.sh
index 2b21e79..5d2f2d1 100755
--- a/utils/reload.sh
+++ b/utils/reload.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/sh
 
 # Hot/live reload - only works in debug mode
 
-docker exec -it contentdb_app_1 sh -c "cp -r /source/* ."
+docker exec contentdb_app_1 sh -c "cp -r /source/* ."
diff --git a/utils/run_migrations.sh b/utils/run_migrations.sh
index d2f0e7b..64774af 100755
--- a/utils/run_migrations.sh
+++ b/utils/run_migrations.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/sh
 
 # Run all pending migrations
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db upgrade"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db upgrade"
diff --git a/utils/tests.sh b/utils/tests.sh
index adedcf4..82df3d1 100755
--- a/utils/tests.sh
+++ b/utils/tests.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py python -m pytest app/tests/ --disable-warnings"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py python -m pytest app/tests/ --cov=app --disable-warnings"
-- 
cgit v1.2.3