Tidy up names and asset wildcards

.github/workflows/damselfly-actions.yml

@@ -112,15 +112,15 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build Docker for Dev
+      - name: Build Docker for Dev (develop only)
         if: github.ref == 'refs/heads/develop'
         run: sh scripts/makedocker.sh dev
 
-      - name: Build Docker for Release
+      - name: Build Docker for Release (master only)
         if: github.ref == 'refs/heads/master'
         run: sh scripts/makedocker.sh
 
-      - name: Create Release
+      - name: Create Release (master only)
         id: create_release
         if: github.ref == 'refs/heads/master'
         uses: actions/create-release@v1
@@ -136,9 +136,10 @@ jobs:
           draft: true
           prerelease: true
 
-      - uses: alexellis/[email protected]   
+      - name: Upload assets to Release (master only)
+        uses: alexellis/[email protected]   
         if: github.ref == 'refs/heads/master'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          asset_paths: '["./server/*", "./publish/wwwroot/desktop"]'  
+          asset_paths: '["./server/*", "./publish/wwwroot/desktop/*"]'  

scripts/makedocker.sh

@@ -1,18 +1,19 @@
 
 if [ -n "$1" ]; then
+    echo 'No docker tag specified. Pushing to dev'
+    DOCKERTAG='dev'
+else
     version=`cat VERSION`
     DOCKERTAG="${version}-beta"
-else
-    echo 'No docker tag specified. Defaulting to dev'
-    DOCKERTAG='dev'
+    echo "Pushing to docker tag: ${DOCKERTAG}"
 fi
 
 echo "**** Building Docker Damselfly"
 docker build -t damselfly . 
 
-echo "*** Pushing docker image to ${DOCKERTAG}"
+echo "*** Pushing docker image to webreaper/damselfly:${DOCKERTAG}"
 
-docker tag damselfly webreaper/damselfly:$DOCKERTAG
-docker push webreaper/damselfly:$DOCKERTAG
+# docker tag damselfly webreaper/damselfly:$DOCKERTAG
+# docker push webreaper/damselfly:$DOCKERTAG
 
 echo "Damselfly docker build complete."