Merge pull request #276 from dod-ccpo/circleci-cd

CircleCI CD
2018-10-16 11:37:09 -04:00
parent dee0479403 714569eda4
commit 38610d0e0a
8 changed files with 349 additions and 43 deletions
--- a/script/cibuild
+++ b/script/cibuild
@@ -13,6 +13,9 @@ PYTHON_FILES="./app.py ./atst/** ./config"
 # Enable Python testing
 RUN_PYTHON_TESTS="true"

+# Reset the DB, since the one script/setup created might not be persisted
+RESET_DB="true"
+
 # Check python formatting
 source ./script/format check

--- a/script/fix_permissions
+++ b/script/fix_permissions
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# script/fix_permissions: Updates the app directory with the correct user 
+#                         permissions (skipping node_modules since it is not
+#                         required and very large)
+
+source "$(dirname "${0}")"/../script/include/global_header.inc.sh
+
+APP_USER="${1}"
+APP_GROUP="${2}"
+
+if [ "${APP_USER}x" = "x" ] || [ "${APP_GROUP}x" = "x" ]; then
+    echo "ERROR: Missing username or groupname argument!"
+    echo "Received: *${APP_USER}:${APP_GROUP}*"
+    echo
+    exit 1
+fi
+
+chown "${APP_USER}:${APP_GROUP}" .
+chown "${APP_USER}:${APP_GROUP}" ./*
+for subdir in $(find . -type d -maxdepth 1 | grep -Ee '.[^/]' | grep -Fve 'node_modules')
+do
+    chown "${APP_USER}:${APP_GROUP}" -R "${subdir}"
+done
--- a/script/generate_build_info.sh
+++ b/script/generate_build_info.sh
@@ -111,7 +111,7 @@ cat > ${STATIC_DIR}/buildinfo.html <<ENDHTML
 <BODY>
 <TABLE border="1">
 <TR>
-        <TH colspan="2">BuildInfo (${BUILT_BY}</TH>
+        <TH colspan="2">BuildInfo (${BUILT_BY})</TH>
 </TR>
 <TR>
        <TD class="label">Container Image Creation Time:</TD>