Create SBOM

.github/workflows/ci.yml

@@ -56,6 +56,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
+    env:
+      ENV_FILE: https://raw.githubusercontent.com/eclipse-pass/pass-docker/main/.env
+
     steps:
       - uses: actions/checkout@v4
 
@@ -64,8 +67,17 @@ jobs:
         with:
           node-version: 20
 
+      - name: Grab pass-docker's .env file
+        run: |
+          wget $ENV_FILE
+        shell: bash
+
       - name: Build local image
-        uses: ./.github/actions/build-pass-ui
+        uses: eclipse-pass/main/.github/actions/node-build@main
+        with:
+          repository_dir: ${{ github.workspace }}
+          env_path: ${{ github.workspace }}/.env
+          create_sbom: false
 
       - name: Run acceptance tests
         uses: eclipse-pass/main/.github/actions/acceptance-test@main

.github/workflows/release.yml

@@ -40,10 +40,16 @@ jobs:
       - name: Tag release
         run: git tag ${{ inputs.releaseversion }}
 
-      - name: Build pass-ui
-        uses: ./.github/actions/build-pass-ui
+      - name: Grab pass-docker's .env file
+        run: |
+          wget $ENV_FILE
+        shell: bash
+
+      - name: Build Release image
+        uses: eclipse-pass/main/.github/actions/node-build@main
         with:
-          is-prod: true
+          repository_dir: ${{ github.workspace }}
+          env_path: ${{ github.workspace }}/.env
 
       - name: Login to GHCR
         uses: docker/login-action@v2
@@ -54,17 +60,16 @@ jobs:
 
       - name: Retag and push
         run: |
-          docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:${{ inputs.releaseversion }}
-          docker push $DOCKER_IMAGE_NAME:latest
           docker push $DOCKER_IMAGE_NAME:${{ inputs.releaseversion }}
 
       - name: Update project version
         run: pnpm version --new-version ${{ inputs.nextversion }}
 
-      - name: Build next dev version
-        uses: ./.github/actions/build-pass-ui
+      - name: Build Next Version image
+        uses: eclipse-pass/main/.github/actions/node-build@main
         with:
-          is-prod: false
+          repository_dir: ${{ github.workspace }}
+          env_path: ${{ github.workspace }}/.env
 
       # Commits made to branch specified in workflow_dispatch, push that branch if possible
       - name: Push release commits to GH
@@ -77,5 +82,4 @@ jobs:
 
       - name: Push next dev version image
         run: |
-          docker tag $DOCKER_IMAGE_NAME:${{ inputs.releaseversion }} $DOCKER_IMAGE_NAME:${{ inputs.nextversion }}
           docker push $DOCKER_IMAGE_NAME:${{ inputs.nextversion }}

.github/workflows/update-docker-image.yml

@@ -23,20 +23,20 @@ jobs:
         with:
           node-version: 20
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 9
-
       - name: Get current project version
         id: project-version
         run: echo "VERSION=`npx -c 'echo $npm_package_version'`" >> $GITHUB_OUTPUT
 
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+      - name: Grab pass-docker's .env file
+        run: |
+          wget $ENV_FILE
+        shell: bash
 
-      - name: Build pass-ui
-        uses: ./.github/actions/build-pass-ui
+      - name: Build local image
+        uses: eclipse-pass/main/.github/actions/node-build@main
+        with:
+          repository_dir: ${{ github.workspace }}
+          env_path: ${{ github.workspace }}/.env
 
       - name: Login to GHCR
         uses: docker/login-action@v2
@@ -47,5 +47,4 @@ jobs:
 
       - name: 'Push new Docker images'
         run: |
-          docker push ghcr.io/eclipse-pass/pass-ui:latest
           docker push ghcr.io/eclipse-pass/pass-ui:${{ steps.project-version.outputs.version }}

.gitignore

@@ -39,6 +39,7 @@ jsconfig.json
 /npm-debug.log*
 /testem.log
 /yarn-error.log
+/*-cyclonedx-sbom.json
 
 .python-version
 .env

Dockerfile

@@ -27,5 +27,6 @@ RUN apk --no-cache add gettext && \
     mkdir /usr/share/nginx/html/app
 
 COPY ./dist/ /usr/share/nginx/html/app/
+COPY ./pass-ui-*-cyclonedx-sbom.json /
 
 ENTRYPOINT [ "/bin/entrypoint.sh" ]

app/index.html

@@ -21,17 +21,17 @@
     <script src="{{rootURL}}assets/pass-ui.js"></script>
 
     <script type="text/javascript" src="{{rootURL}}js/fuzzyset.js"></script>
-    <script type="text/javascript" src="//code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/jquery-3.6.4.min.js"></script>
     <script
       src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
       integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
       crossorigin="anonymous"
     ></script>
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.7.8/handlebars.js"></script>
     <script type="text/javascript" src="//code.cloudcms.com/alpaca/1.5.24/bootstrap/alpaca.min.js"></script>
     <script
       type="text/javascript"
-      src="https://cdn.jsdelivr.net/npm/sweetalert2@7.26.10/dist/sweetalert2.all.min.js"
+      src="https://cdn.jsdelivr.net/npm/sweetalert2@7.29.0/dist/sweetalert2.all.min.js"
     ></script>
 
     {{content-for "body-footer"}}

package.json

@@ -3,7 +3,7 @@
   "version": "1.13.0-SNAPSHOT",
   "private": true,
   "description": "The user interface for the eclipse-pass project",
-  "license": "MIT",
+  "license": "Apache-2.0",
   "author": "",
   "directories": {
     "doc": "doc",
@@ -26,37 +26,62 @@
     "start": "ember server",
     "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "create_sbom": "FETCH_LICENSE=true cdxgen --required-only --no-babel --type pnpm -o pass-ui-$npm_package_version-cyclonedx-sbom.json"
+  },
+  "dependencies": {
+    "@coreui/ajax": "1.0.10",
+    "@ember/string": "^3.1.1",
+    "@fortawesome/ember-fontawesome": "^2.0.0",
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-regular-svg-icons": "^6.4.0",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "ajv": "^6.10.0",
+    "alpaca": "1.5.24",
+    "bootstrap": "5.0.0",
+    "ember-bootstrap": "^6.3.2",
+    "ember-composable-helpers": "^5.0.0",
+    "ember-concurrency": "^2.3.4",
+    "ember-concurrency-decorators": "^1.0.0",
+    "ember-data": "~5.3.3",
+    "ember-file-upload": "^9.0.0",
+    "ember-inflector": "^4.0.2",
+    "ember-load-initializers": "^2.1.2",
+    "ember-lodash": "^4.19.4",
+    "ember-modal-dialog": "^4.1.4",
+    "ember-models-table": "^5.4.1",
+    "ember-modifier": "^4.1.0",
+    "ember-page-title": "^8.2.3",
+    "ember-power-select": "^7.0.0",
+    "ember-radio-buttons": "^5.0.0",
+    "ember-resolver": "^11.0.1",
+    "ember-simple-auth": "^6.0.0",
+    "ember-tether": "^3.1.0",
+    "jquery": "3.6.4",
+    "loader.js": "^4.7.0",
+    "popper.js": "^1.14.5",
+    "sweetalert2": "7.29.0"
   },
   "devDependencies": {
     "@babel/core": "^7.24.4",
     "@babel/eslint-parser": "^7.24.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.24.1",
-    "@coreui/ajax": "1.0.10",
+    "@cyclonedx/cdxgen": "^11.0.3",
     "@ember/optional-features": "^2.1.0",
     "@ember/render-modifiers": "^2.0.5",
-    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.3.0",
     "@embroider/compat": "^3.5.6",
     "@embroider/core": "^3.4.14",
     "@embroider/webpack": "^4.0.4",
     "@faker-js/faker": "^8.1.0",
-    "@fortawesome/ember-fontawesome": "^2.0.0",
-    "@fortawesome/fontawesome-svg-core": "^6.5.2",
-    "@fortawesome/free-regular-svg-icons": "^6.4.0",
-    "@glimmer/component": "^1.1.2",
-    "@glimmer/tracking": "^1.1.2",
-    "ajv": "^6.10.0",
-    "alpaca": "1.5.27",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "bootstrap": "^5.0.0",
     "broccoli-asset-rev": "^3.0.0",
     "clean-css": ">=4.1.11",
     "concurrently": "^8.2.2",
     "coveralls": "^3.0.2",
     "ember-auto-import": "^2.7.2",
-    "ember-bootstrap": "^6.3.2",
     "ember-cli": "~5.8.0",
     "ember-cli-app-version": "^6.0.1",
     "ember-cli-babel": "^8.2.0",
@@ -72,29 +97,12 @@
     "ember-cli-mirage": "^3.0.3",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.3.4",
-    "ember-concurrency-decorators": "^1.0.0",
-    "ember-data": "~5.3.3",
-    "ember-file-upload": "^9.0.0",
-    "ember-inflector": "^4.0.2",
-    "ember-load-initializers": "^2.1.2",
-    "ember-lodash": "^4.19.4",
-    "ember-modal-dialog": "^4.1.4",
-    "ember-models-table": "^5.4.1",
-    "ember-modifier": "^4.1.0",
-    "ember-page-title": "^8.2.3",
-    "ember-power-select": "^7.0.0",
     "ember-qunit": "^8.0.2",
-    "ember-radio-buttons": "^5.0.0",
-    "ember-resolver": "^11.0.1",
-    "ember-simple-auth": "^6.0.0",
     "ember-sinon-qunit": "^7.1.4",
     "ember-source": "~5.8.0",
     "ember-template-lint": "6.0.0",
     "ember-template-lint-plugin-prettier": "^5.0.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-tether": "^3.1.0",
     "ember-truth-helpers": "^3.1.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
@@ -103,12 +111,9 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-qunit": "^8.1.1",
     "husky": "^8.0.0",
-    "jquery": "^3.6.4",
     "lint-staged": "^13.2.3",
-    "loader.js": "^4.7.0",
     "merge": ">=1.2.1",
     "miragejs": "^0.1.48",
-    "popper.js": "^1.14.5",
     "prettier": "^3.3.0",
     "qunit": "^2.20.1",
     "qunit-dom": "^3.1.2",
@@ -117,7 +122,6 @@
     "stylelint": "^16.6.1",
     "stylelint-config-standard": "^36.0.0",
     "stylelint-prettier": "^5.0.0",
-    "sweetalert2": "^7.29.0",
     "tracked-built-ins": "^3.3.0",
     "webpack": "^5.92.1"
   },