Merge pull request #1063 from mountaindude/docker-build

Docker build
ptarmiganlabs · Apr 8, 2024 · 4d52d61 · 4d52d61
2 parents 4c44b8a + cc7bf2c
commit 4d52d61
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -344,7 +344,7 @@ jobs:
           dir
           del build.cjs
           del "./${env:DIST_FILE_NAME}.exe"
-          del "./${{ needs.release-please.outputs.release_version }}-win.zip"
+          del "./${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-win.zip"
 
   release-linux:
     needs: release-please
@@ -403,10 +403,10 @@ jobs:
           # - ./src/config⁄schedule_template.yaml
 
           ls -la
-          zip -9 -r "./${{ needs.release-please.outputs.release_version }}-linux.zip" ${DIST_FILE_NAME} 
+          zip -9 -r "./${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-linux.zip" ${DIST_FILE_NAME} 
 
           cd src
-          zip -9 -u -r "../${{ needs.release-please.outputs.release_version }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
+          zip -9 -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
           cd ..
 
       - name: Debug
@@ -423,7 +423,7 @@ jobs:
           # artifactContentType: application/zip
           draft: true
           tag: ${{ needs.release-please.outputs.release_version }}
-          artifacts: ./${{ needs.release-please.outputs.release_version }}-linux.zip
+          artifacts: ./butler-${{ needs.release-please.outputs.release_version }}-linux.zip
           token: ${{ github.token }}
 
       - name: Tidy up before existing

diff --git a/.github/workflows/docker-image-build.yaml b/.github/workflows/docker-image-build.yaml
@@ -81,7 +81,7 @@ jobs:
         run: |
           #export TAGTMP1=${{ github.ref }}
           #export TAG=${TAGTMP1##*/}
-          export TAG=$(echo ${{ github.ref }} | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | cut -c 2-)
+          export TAG=$(echo ${{ github.ref }} | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"
           echo "TAG=$TAG" >> $GITHUB_ENV
           #
           # Debug

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
         "qrs-interact": "^6.3.1",
         "rate-limiter-flexible": "^5.0.0",
         "serializeapp": "^3.0.0",
-        "systeminformation": "^5.22.6",
+        "systeminformation": "^5.22.7",
         "upath": "^2.0.1",
         "uuid": "^9.0.1",
         "winston": "^3.13.0",
@@ -111,7 +111,7 @@
         "eslint-plugin-import": "^2.29.1",
         "jest": "^29.7.0",
         "prettier": "^3.2.5",
-        "snyk": "^1.1286.2"
+        "snyk": "^1.1287.0"
     },
     "pkg": {
         "assets": [