Merge branch 'staging' of https://github.com/FNNDSC/ChRIS_ui into staging

Author: PintoGideon

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-24.04
-    if: github.repository_owner == 'FNNDSC' && secrets.GITHUB_TOKEN != ''
     steps:
       - uses: actions/checkout@v4
         with:
@@ -18,7 +17,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9
           run_install: false
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -49,11 +47,14 @@ jobs:
           driver-opts: network=host
       - name: Login to DockerHub
         id: dockerhub_login
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Login to GitHub Container Registry
+        id: ghcr_login
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -67,11 +68,11 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/386
-          push: true
+          push: ${{ steps.dockerhub_login.outcome == 'success' && steps.ghcr_login.outcome == 'success' }}
 
       - name: Update DockerHub description
         uses: peter-evans/dockerhub-description@v4
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.dockerhub_login.outcome == 'success'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/test.yml

@@ -13,12 +13,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: "0"  # necessary for `npm run print-version`
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
         with:
-          version: 8
-      - uses: actions/setup-node@v4
+          run_install: false
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20.17
+          node-version: 20
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm test
@@ -103,4 +105,4 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/lcov.info
           flags: e2etests-local
-          fail_ci_if_error: true
+          fail_ci_if_error: true

docker-entrypoint.sh

@@ -36,8 +36,7 @@ source "$env_file"
 target=/srv
 
 if find "$target" -mindepth 1 | grep -q .; then
-  echo "error: $target not empty, refusing to overwrite."
-  exit 1
+  >&2 echo "WARNING: $target is not empty, it might contain out-of-date or otherwise stray files. If you just restarted this container, you can ignore this warning."
 fi
 
 # create directories in target folder