From 30801938306b4c1f0fbc1fe8d63c0024d7d5d304 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Thu, 6 Mar 2025 16:18:49 -0500 Subject: [PATCH] build cups using docker --- mocha-cup/src/mocha-cup | 54 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/mocha-cup/src/mocha-cup b/mocha-cup/src/mocha-cup index 18b3d48..c799c21 100755 --- a/mocha-cup/src/mocha-cup +++ b/mocha-cup/src/mocha-cup @@ -1,5 +1,55 @@ #!/bin/bash +SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +WORKING_DIR=`pwd` +CREATE_DEFAULT_MOCHAFILE=0 -WEB_EXE=../../mocha-python/mocha-python/src/mocha-python/mocha-web.py +if [ $CREATE_DEFAULT_MOCHAFILE -eq 1 ]; then + + if [ ! -f $WORKING_DIR/Mochafile ]; then + echo "warning: Mochafile not found, a default one will be generated" + echo "mocha: + version: 2 + +tenants: +- name: super +" > Mochafile + + fi + +fi + +# WEB_EXE=$CURDIR/../../mocha-python/mocha-python/src/mocha-python/mocha-web.py +# python3 $WEB_EXE ${1+"$@"} + + +cd $SCRIPT_DIR/../../../mocha-suv +source ./docker-run --export-vars --enable-ssh + +echo "new MOCHA SUV name: $MOCHA_NEW_SUV_NAME" + +cd $WORKING_DIR + +if [ -f Mochafile ]; then + + # ZIP the contents of the working directory into a CUP + # zip -r Mochafile.cup * + yaml2json Mochafile > Mochafile.json + + Q=$? + if [ $Q -ne 0 ]; then + + exit $Q + fi + +fi + +if [ -f Mochafile.json ]; then + + # Upload the resulting CUP to the running SUV + sshpass -p $MOCHA_NEW_SUV_PASSWORD_WEBMASTER scp -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ./Mochafile.json webmaster@$MOCHA_NEW_SUV_NAME.privatesuv.com:/var/mocha/uploads/Mochafile.json + + docker container exec $MOCHA_NEW_SUV_NAME mochactl reload + rm Mochafile.json + +fi -python3 $WEB_EXE ${1+"$@"} \ No newline at end of file