Merge branch 'main' into RISDEV-5883_duplicate_check_frontend

digitalservicebund · Jan 17, 2025 · 7671f85 · 7671f85
2 parents 8409e55 + 51948e7
commit 7671f85
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/backend-checks.yml b/.github/workflows/backend-checks.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           echo "GRADLE_VERSION=$(sed -n 's/.*gradle-\([0-9]*\(\.[0-9]*\)*\)-.*/\1/p' ./gradle/wrapper/gradle-wrapper.properties)" >> $GITHUB_ENV
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -67,7 +67,7 @@ jobs:
         run: |
           echo "GRADLE_VERSION=$(sed -n 's/.*gradle-\([0-9]*\(\.[0-9]*\)*\)-.*/\1/p' ./gradle/wrapper/gradle-wrapper.properties)" >> $GITHUB_ENV
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -99,7 +99,7 @@ jobs:
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -33,7 +33,7 @@ jobs:
         run: |
           echo "GRADLE_VERSION=$(sed -n 's/.*gradle-\([0-9]*\(\.[0-9]*\)*\)-.*/\1/p' ./gradle/wrapper/gradle-wrapper.properties)" >> $GITHUB_ENV
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -73,7 +73,7 @@ jobs:
         run: |
           echo "GRADLE_VERSION=$(sed -n 's/.*gradle-\([0-9]*\(\.[0-9]*\)*\)-.*/\1/p' ./gradle/wrapper/gradle-wrapper.properties)" >> $GITHUB_ENV
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -160,7 +160,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -697,7 +697,7 @@ jobs:
         run: |
           echo "GRADLE_VERSION=$(sed -n 's/.*gradle-\([0-9]*\(\.[0-9]*\)*\)-.*/\1/p' ./gradle/wrapper/gradle-wrapper.properties)" >> $GITHUB_ENV
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"
@@ -733,7 +733,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        uses: actions/setup-java@99d3141d9ba96520552bfd7a9545bc1d74da9251
         with:
           java-version: "21.0"
           distribution: "temurin"

diff --git a/compose.yaml b/compose.yaml
@@ -153,7 +153,7 @@ services:
       timeout: 3s
 
   redis:
-    image: cgr.dev/chainguard/redis@sha256:dc74ed2817f14bca80560beeb1feed5a0f285fc6f5b00fe748554e9b4c7db2fd
+    image: cgr.dev/chainguard/redis@sha256:4a3f3d1b9498de0aa7d7fbed50600c40e5d5e4332b495d25a14b4b58cc09ed98
     extra_hosts:
       - localhost:host-gateway
     container_name: redis

diff --git a/frontend/Dockerfile.prod b/frontend/Dockerfile.prod
@@ -3,7 +3,7 @@ WORKDIR /usr/src/app
 COPY . .
 RUN npm install && npx vite build
 
-FROM cgr.dev/chainguard/nginx@sha256:4186a153d59aee880f8bd52dd258372464f2aaf41baf6d907690207b60910f4a
+FROM cgr.dev/chainguard/nginx@sha256:a3ce7b468befa2912631496c758566164bb7444bba1277b596f2bfbfba19c8f5
 EXPOSE 8081
 COPY --from=builder /usr/src/app/dist /var/lib/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/ris.conf
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -64,7 +64,7 @@
     "@tiptap/extension-underline": "^2.11.2",
     "@tiptap/vue-3": "^2.11.2",
     "@unhead/vue": "^1.11.18",
-    "@unleash/proxy-client-vue": "^0.1.2",
+    "@unleash/proxy-client-vue": "^0.1.4",
     "@vueuse/core": "^12.4.0",
     "@vueuse/router": "^12.4.0",
     "axios": "^1.7.9",
@@ -97,7 +97,7 @@
     "@testing-library/user-event": "^14.6.0",
     "@testing-library/vue": "^8.1.0",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^22.10.6",
+    "@types/node": "^22.10.7",
     "@typescript-eslint/eslint-plugin": "^8.20.0",
     "@typescript-eslint/parser": "^8.20.0",
     "@vitejs/plugin-vue": "^5.2.1",