Fixes

Author: DrJStrudwick

.github/workflows/docker-image.yml

@@ -17,7 +17,7 @@ env:
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
   build-and-push-image:
-    if: github.event.pull_request.merged == true || github.base_ref == '31-fix-cidi-pipeline'
+    if: ${{ (github.event.pull_request.merged == true) || (github.base_ref == '31-fix-cidi-pipeline') }}
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
@@ -52,7 +52,7 @@ jobs:
           tags: |
             type=raw,value=latest,enable=${{ github.base_ref == 'main' }}
             type=semver,pattern={{version}},value=${{ env.VER }},enable=${{ github.base_ref == 'main' }}
-            type=raw,value=dev,enable=${{ github.base_ref == 'dev' || github.branch == 'dev' }}
+            type=raw,value=dev,enable=${{ (github.base_ref == 'dev') || (github.branch == 'dev') }}
             type=raw,value=cicd-test,enable=${{ github.branch == '31-fix-cidi-pipeline' }}
 
       # js: added in for multi arch building