first attempt

.github/workflows/build-apps.yml

@@ -37,11 +37,13 @@ jobs:
           echo "APPLICATION: $APPLICATION"
           cd recipes/$APPLICATION
           echo `which python`
-          /bin/bash build.sh
+          /bin/bash ../build.sh
       - name: Setup rclone
         run: |
           mkdir -p ~/.config/rclone
-          echo "$RCLONE_CONFIG" > ~/.config/rclone/rclone.conf
+          if [ ! -f ~/.config/rclone/rclone.conf ]; then
+            echo "$RCLONE_CONFIG" > ~/.config/rclone/rclone.conf
+          fi
       - name: Set image variables
         id: IMAGEVARS
         run: |
@@ -50,5 +52,5 @@ jobs:
           echo "IMAGENAME: $IMAGENAME"
           echo "IMAGENAME_TEST=${IMAGENAME//_/ }" >> $GITHUB_ENV
           echo "IMAGENAME=$IMAGENAME" >> $GITHUB_ENV
-      - name : Upload file
+      - name : Upload zip file
         run: /bin/bash .github/workflows/upload-zip.sh $IMAGENAME

.github/workflows/upload-zip.sh

@@ -6,27 +6,26 @@ cd recipes/$APPLICATION
 
 IMAGENAME=$1
 
+IMAGE_HOME=/storage/openrecon
+
 #This prevents the sometimes stuck apt process from stopping the build
 if [ -f "/var/lib/apt/lists/lock" ]; then
   sudo rm /var/lib/apt/lists/lock
   sudo rm /var/cache/apt/archives/lock
   sudo rm /var/lib/dpkg/lock*
 fi
 
-echo "[DEBUG] Attempting upload to Nectar Object Storage ..."
-rclone copy --progress $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip nectar:/neurodesk/openrecon
-
 echo "[DEBUG] Attempting upload to AWS Object Storage ..."
-rclone copy --progress $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip aws-neurocontainers:/neurocontainers/openrecon
+rclone copy --progress $IMAGE_HOME/${IMAGENAME}.zip aws-neurocontainers:/openrecon
 
-if curl --output /dev/null --silent --head --fail "https://object-store.rc.nectar.org.au/v1/AUTH_dead991e1fa847e3afcca2d3a7041f5d/neurodesk/openrecon/${IMAGENAME}_${BUILDDATE}.zip"; then
-    echo "[DEBUG] ${IMAGENAME}_${BUILDDATE}.simg was freshly build and exists now :)"
-    echo "[DEBUG] cleaning up $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip"
-    rm -rf $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip
+if curl --output /dev/null --silent --head --fail "https://openrecon.neurodeks.org/${IMAGENAME}.zip"; then
+    echo "[DEBUG] ${IMAGENAME}.simg was freshly build and exists now :)"
+    echo "[DEBUG] cleaning up $IMAGE_HOME/${IMAGENAME}.zip"
+    rm -rf $IMAGE_HOME/${IMAGENAME}.zip
 else
-    echo "[ERROR] ${IMAGENAME}_${BUILDDATE}.zip does not exist yet. Something is WRONG"
-    echo "[ERROR] cleaning up $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip"
-    rm -rf $IMAGE_HOME/${IMAGENAME}_${BUILDDATE}.zip
+    echo "[ERROR] ${IMAGENAME}.zip does not exist yet. Something is WRONG"
+    echo "[ERROR] cleaning up $IMAGE_HOME/${IMAGENAME}.zip"
+    rm -rf $IMAGE_HOME/${IMAGENAME}.zip
     exit 2
 fi
 

.gitignore

@@ -0,0 +1 @@
+.DS_Store

recipes/build.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# check and install dependencies
+if ! pip3 show jsonschema &> /dev/null; then
+    pip3 install jsonschema
+fi
+
+if ! pip3 show packaging &> /dev/null; then
+    pip3 install packaging
+fi
+
+if ! command -v 7z &> /dev/null; then
+    sudo apt install p7zip
+fi
+
+# check docker version
+python ../checkDockerVersion.py
+
+# build zip file
+python build.py
+

recipes/defacing/build.py

@@ -1,6 +1,6 @@
 # Validate JSON file against OpenRecon schema and write Dockerfile
 jsonFilePath    = 'OpenReconLabel.json'
-schemaFilePath  = 'OpenReconSchema_1.1.0.json'
+schemaFilePath  = '../OpenReconSchema_1.1.0.json'
 dockerfilePath  = 'OpenRecon.dockerfile'
 baseDockerImage = 'stebo85/niimath-test'
 
@@ -68,10 +68,10 @@ def validateJson(jsonFilePath, schemaFilePath):
     raise Exception('Could not find documentation file: ' + docsFile)
 
 # Check 7-zip exists
-zipExe = '7z'
+zipExe = '/usr/bin/7z'
 
 if not os.path.isfile(zipExe):
-    raise Exception('Could not find 7-Zip executable: ' + docsFile + '\nPlease download and install 7-Zip')
+    raise Exception('Could not find 7-Zip executable: ' + zipExe + '\nPlease download and install 7-Zip')
 
 dockerImagename = ('OpenRecon_' + vendor + '_' + name + ':' +  'V' + version).lower()
 baseFilename    =  'OpenRecon_' + vendor + '_' + name +       '_V' + version