Merge branch 'main' of github.com:structr/structr-deploy-action

Author: derkaiserreich

README.md

@@ -28,5 +28,6 @@ jobs:
           neo4j-version: 'latest'
           structr-version: '5.2.1'
           structr-webapp-path: '${{ github.workspace }}/webapp'
+          structr-conf-file: '${{ github.workspace }}/structr.conf'
           structr-license: '${{ secrets.STRUCTR_LICENSE }}'
 ```

action.yml

@@ -45,9 +45,8 @@ runs:
       run: >-        
         ./setup_environment.sh ${{ github.action_path }} &&
         cd ${{ github.action_path }} && docker compose up -d      
-        
       shell: bash      
 
     - name: Deploy given webapp
       run: cd ${{ github.action_path }} && ./deploy.sh
-      shell: bash
+      shell: bash

setup_environment.sh

@@ -8,8 +8,9 @@ sed -i "s|STRUCTR_LICENSE|$STRUCTR_LICENSE|g" docker-compose.yml &&
 sed -i "s|STRUCTR_VERSION|$STRUCTR_VERSION|g" docker-compose.yml &&
 sed -i "s|STRUCTR_WEBAPP_PATH|$STRUCTR_WEBAPP_PATH|g" docker-compose.yml &&
 
-if [ -z ${STRUCTR_CONF_FILE:-"./structr.conf"} ]; then
+if [ -z "$STRUCTR_CONF_FILE" ]; then
+    STRUCTR_CONF_FILE="./structr.conf"
     touch ./structr.conf
 fi
 
-sed -i "s|STRUCTR_CONF_FILE|$STRUCTR_CONF_FILE|g" docker-compose.yml
+sed -i "s|STRUCTR_CONF_FILE|$STRUCTR_CONF_FILE|g" docker-compose.yml