From 94759cc5df20abd0d37db784c98df5d6101917aa Mon Sep 17 00:00:00 2001
From: Felix Dittrich <31076102+f11h@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:44:32 +0200
Subject: [PATCH 1/2] Remove old MTR from CI-Master

---
 .github/workflows/ci-master.yml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 9519bb00..95d68d00 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -44,27 +44,7 @@ jobs:
         docker push ghcr.io/${GITHUB_REPOSITORY}/cwa-quick-test-backend:${VERSION}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: docker push trusted
-      run: |
-        echo ${TRUSTED_TOKEN} | docker login ${TRUSTED_URL} -u ${TRUSTED_USER} --password-stdin
-        export DOCKER_CONTENT_TRUST=1
-        export DOCKER_CONTENT_TRUST_SERVER=${TRUSTED_SERVER_URL}
-        export DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE=${TRUSTED_TOKEN}
-        export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE=${TRUSTED_TOKEN}
-        gpg --quiet --batch --yes --decrypt --passphrase=${TRUSTED_KEY} \
-        --output trusted.key trusted.key.gpg
-        chmod 600 trusted.key
-        docker trust key load trusted.key --name user
-        docker trust sign ${TRUSTED_URL}/${TRUSTED_REPOSITORY}/cwa-quick-test-backend:${VERSION}
-        docker push ${TRUSTED_URL}/${TRUSTED_REPOSITORY}/cwa-quick-test-backend:${VERSION}
-      env:
-        TRUSTED_KEY: ${{ secrets.TRUSTED_KEY }}
-        TRUSTED_URL: ${{ secrets.TRUSTED_URL }}
-        TRUSTED_SERVER_URL: ${{ secrets.TRUSTED_SERVER_URL }}
-        TRUSTED_REPOSITORY: ${{ secrets.TRUSTED_REPOSITORY }}
-        TRUSTED_USER: ${{ secrets.TRUSTED_USER }}
-        TRUSTED_TOKEN: ${{ secrets.TRUSTED_TOKEN }}
-    - name: docker push new mtr
+    - name: docker push mtr
       run: |
         echo ${MTR_TOKEN} | docker login ${MTR_REPOSITORY} -u ${MTR_USER} --password-stdin
         docker push ${MTR_REPOSITORY}/cwa-quick-test-backend:${VERSION}

From 885e9ab5fd65c9abd687896d1dd153f11816a88b Mon Sep 17 00:00:00 2001
From: Felix Dittrich <31076102+f11h@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:52:00 +0200
Subject: [PATCH 2/2] Update ci-master.yml

---
 .github/workflows/ci-master.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 95d68d00..799cc7a5 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -26,14 +26,11 @@ jobs:
       run: docker build
         --tag ghcr.io/${GITHUB_REPOSITORY}/cwa-quick-test-backend:latest
         --tag ghcr.io/${GITHUB_REPOSITORY}/cwa-quick-test-backend:${VERSION}
-        --tag ${TRUSTED_URL}/${TRUSTED_REPOSITORY}/cwa-quick-test-backend:${VERSION}
         --tag ${MTR_REPOSITORY}/cwa-quick-test-backend:${VERSION}
         --build-arg MAVEN_PASSWORD=${APP_PACKAGES_PASSWORD}
         --build-arg MAVEN_USERNAME=${APP_PACKAGES_USERNAME}
         .
       env:
-        TRUSTED_URL: ${{ secrets.TRUSTED_URL }}
-        TRUSTED_REPOSITORY: ${{ secrets.TRUSTED_REPOSITORY }}
         APP_PACKAGES_USERNAME: ${{ github.actor }}
         APP_PACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         MTR_REPOSITORY: ${{ secrets.MTR_REPOSITORY }}