Merge pull request #37 from mlibrary/2023-11-06-updates

November 2023 dependency updates.
mlibrary · Nov 6, 2023 · c6e695a · c6e695a
2 parents c4c472e + be15a27
commit c6e695a
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 51 deletions.
diff --git a/.github/workflows/build-deploy-on-release.yaml b/.github/workflows/build-deploy-on-release.yaml
@@ -14,6 +14,21 @@ jobs:
       dockerfile: Dockerfile
     secrets: inherit
 
+  scan-image:
+    needs: build-production
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: ghcr.io/mlibrary/${{ vars.IMAGE_NAME }}:${{ github.event.release.tag_name }}
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH'
+          skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem'
+
   deploy-production:
     needs: build-production
     name: Deploy to production

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -16,6 +16,21 @@ jobs:
       dockerfile: Dockerfile
     secrets: inherit
 
+  scan-image:
+    needs: build-unstable
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: ${{ needs.build-unstable.outputs.image }}
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH'
+          skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem'
+
   deploy-testing:
     needs: build-unstable
     name: Deploy to testing

diff --git a/.github/workflows/manual-deploy-unstable.yaml b/.github/workflows/manual-deploy-unstable.yaml
@@ -25,6 +25,21 @@ jobs:
       dockerfile: Dockerfile
     secrets: inherit
 
+  scan-image:
+    needs: build-unstable
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: ${{ needs.build-unstable.outputs.image }}
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH'
+          skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem'
+
   deploy:
     needs: build-unstable
     name: Deploy to ${{ github.event.inputs.tanka_env }}

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.0)
-      activesupport (= 7.1.0)
-    activesupport (7.1.0)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -16,7 +16,7 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
-    anyway_config (2.5.3)
+    anyway_config (2.5.4)
       ruby-next-core (>= 0.14.0)
     ast (2.4.2)
     attr_required (1.0.1)
@@ -48,9 +48,9 @@ GEM
     ffi (1.16.3)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    http-2-next (1.0.0)
-    httpx (1.0.1)
-      http-2-next (>= 1.0.0)
+    http-2-next (1.0.1)
+    httpx (1.1.0)
+      http-2-next (>= 1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
@@ -77,7 +77,7 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.1.2)
-    net-imap (0.4.0)
+    net-imap (0.4.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -111,7 +111,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    prometheus-client (4.2.1)
+    prometheus-client (4.2.2)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -121,7 +121,7 @@ GEM
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-oauth2 (2.2.0)
       activesupport
@@ -138,7 +138,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -165,7 +165,7 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -192,18 +192,18 @@ GEM
       tilt (~> 2.0)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
-    standard (1.31.1)
+    standard (1.31.2)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.2)
+      rubocop (~> 1.56.4)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.2)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.2.0)
+    standard-performance (1.2.1)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.0)
+      rubocop-performance (~> 1.19.1)
     swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)

diff --git a/package-lock.json b/package-lock.json