From 31d3e884d4b5cd2823c8a4fe4d9eafbce7d16f6b Mon Sep 17 00:00:00 2001
From: Tomasz Kuzynowski <tomasz.kuzynowski@gmail.com>
Date: Wed, 11 Jan 2023 15:47:47 +0100
Subject: [PATCH 1/4] be able to provide image even if scan fail

---
 .github/workflows/dockerImage.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
index 0b84b37..a6ae0cd 100644
--- a/.github/workflows/dockerImage.yml
+++ b/.github/workflows/dockerImage.yml
@@ -141,13 +141,20 @@ jobs:
           echo "### Publish Docker image :x:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- It seems that something has gone wrong" >> $GITHUB_STEP_SUMMARY
+      - name: Publish to T-sys if T-sys release
+        if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
+          method: 'POST'
+          customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'
       - name: Run Trivy vulnerability image scanner
         if: ${{ (matrix.registry == 'ghcr.io') }}
         uses: aquasecurity/trivy-action@master
         with:
           image-ref: '${{ env.DOCKER_REGISTRY }}/${{ env.REPO_NAME_WITHOUT_PREFIX }}:${{ env.DOCKER_IMAGE_TAG }}'
           format: 'table'
-          exit-code: '1'
+          exit-code: '0'
           vuln-type: 'os,library'
           severity: 'CRITICAL'
       - name: Microsoft Teams Fail Card
@@ -183,10 +190,3 @@ jobs:
           custom-actions: |
             - text: View CI
               url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-      - name: Publish to T-sys if T-sys release
-        if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
-        uses: fjogeleit/http-request-action@v1
-        with:
-          url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
-          method: 'POST'
-          customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'

From 5a992964c0e304b93977c10ff0f65f336a6cc4da Mon Sep 17 00:00:00 2001
From: tkuzynow <tomasz.kuzynowski@gmail.com>
Date: Wed, 12 Apr 2023 08:47:18 +0200
Subject: [PATCH 2/4] chore: bump dependency

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5ed54da..d8d1793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,11 @@
       <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>2.0</version>
+    </dependency>
   </dependencies>
 
   <repositories>

From 43e1a5ddb8541866c23398a1bb8154cbb3314cb7 Mon Sep 17 00:00:00 2001
From: tkuzynow <tomasz.kuzynowski@gmail.com>
Date: Thu, 9 Nov 2023 12:24:50 +0100
Subject: [PATCH 3/4] chore: merge with develop

---
 src/main/resources/application-local.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index 9433bde..3bfc31e 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -23,11 +23,11 @@ keycloak.principal-attribute=preferred_username
 keycloak.cors=false
 keycloakService.techuser.id=658c7779-bb6d-42e2-bec9-3f2010b76ea1
 keycloakService.admin.username=realmadmin
-keycloakService.admin.password=Testtest!12
+keycloakService.admin.password=
 keycloakService.admin.clientId=admin-cli
 
 # Rocket.Chat
 rocket.chat.api.url=http://localhost:3000/api/v1
 rocket.systemuser.username=system1
-rocket.systemuser.password=system
+rocket.systemuser.password=
 rocket.credentialscheduler.cron=0 0/5 * * * ?
\ No newline at end of file

From ded82c55b44b14932cb3a5f0fccd5eaef3b7565f Mon Sep 17 00:00:00 2001
From: tkuzynow <tomasz.kuzynowski@gmail.com>
Date: Thu, 9 Nov 2023 12:32:25 +0100
Subject: [PATCH 4/4] chore: fix dockerImage

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3fda94d..790d48a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,5 @@ FROM adoptopenjdk/openjdk11
 VOLUME ["/tmp","/log"]
 EXPOSE 8080
 ARG JAR_FILE
-COPY ./target/UploadService.jar app.jar
+COPY ./UploadService.jar app.jar
 ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]