From 187435be54f66d88dda11c152c38205223791f38 Mon Sep 17 00:00:00 2001
From: Peter Motzko <peter.motzko@volkswagen.de>
Date: Mon, 10 Jul 2023 13:30:41 +0200
Subject: [PATCH] fix(devel): replace docker_compose env var with real command

---
 .github/workflows/service-build.yaml | 4 ++--
 .github/workflows/veracode.yaml      | 6 +++---
 dev-assets/tasks/darwin/docker.yaml  | 4 ++--
 dev-assets/tasks/linux/docker.yaml   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/service-build.yaml b/.github/workflows/service-build.yaml
index dbc30cda4..bc9d619ff 100644
--- a/.github/workflows/service-build.yaml
+++ b/.github/workflows/service-build.yaml
@@ -80,7 +80,7 @@ jobs:
         uses: veracode/veracode-uploadandscan-action@0.2.1
         continue-on-error: true
         with:
-          appname: 'project-managed-identity-wallets'
+          appname: 'project-managed-identity-wallet'
           createprofile: false
           filepath: 'build/libs/*' # add filepath for upload
           vid: '${{ secrets.ORG_VERACODE_API_ID }}' # reference to API ID, which is set as github org. secret
@@ -93,4 +93,4 @@ jobs:
           context: .
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest${{ env.TAG_SUFFIX }}, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APP_VERSION }}.${{ env.SHORT_SHA }}, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APP_VERSION }}${{ env.TAG_SUFFIX }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 80b22d649..2f07c5426 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -73,9 +73,9 @@ jobs:
         uses: veracode/veracode-uploadandscan-action@0.2.1
         continue-on-error: true
         with:
-          appname: 'project-managed-identity-wallets'
+          appname: 'project-managed-identity-wallet'
           createprofile: false
-          filepath: 'build/install/org.eclipse.tractusx.managedidentitywallets/lib/*' # add filepath for upload
+          filepath: 'build/libs/*' # add filepath for upload
           vid: '${{ secrets.ORG_VERACODE_API_ID }}' # reference to API ID, which is set as github org. secret
           vkey: '${{ secrets.ORG_VERACODE_API_KEY }}' #reference to API Key in github, which is set as github or. secret
-          include: 'build/install/org.eclipse.tractusx.managedidentitywallets/lib/org.eclipse.tractusx.managedidentitywallets-*jar'
+          include: 'build/libs/miw-latest.jar'
diff --git a/dev-assets/tasks/darwin/docker.yaml b/dev-assets/tasks/darwin/docker.yaml
index 40281a440..cd3fa1fd5 100644
--- a/dev-assets/tasks/darwin/docker.yaml
+++ b/dev-assets/tasks/darwin/docker.yaml
@@ -36,13 +36,13 @@ tasks:
     cmds:
       - cat postgres/db.sh.tpl | envsubst > postgres/db.sh
       - chmod +x postgres/db.sh
-      - "$COMPOSE_COMMAND up {{.OPTIONS}} {{.CONTAINERS}}"
+      - "docker compose up {{.OPTIONS}} {{.CONTAINERS}}"
 
   stop-middleware:
     desc: Stop local Docker environment
     dir: dev-assets/docker-environment
     cmds:
-      - $COMPOSE_COMMAND down
+      - docker compose down
       - cmd: docker volume remove docker-environment_postgres_data
         ignore_error: true
       - rm -f postgres/db.sh
diff --git a/dev-assets/tasks/linux/docker.yaml b/dev-assets/tasks/linux/docker.yaml
index 40281a440..cd3fa1fd5 100644
--- a/dev-assets/tasks/linux/docker.yaml
+++ b/dev-assets/tasks/linux/docker.yaml
@@ -36,13 +36,13 @@ tasks:
     cmds:
       - cat postgres/db.sh.tpl | envsubst > postgres/db.sh
       - chmod +x postgres/db.sh
-      - "$COMPOSE_COMMAND up {{.OPTIONS}} {{.CONTAINERS}}"
+      - "docker compose up {{.OPTIONS}} {{.CONTAINERS}}"
 
   stop-middleware:
     desc: Stop local Docker environment
     dir: dev-assets/docker-environment
     cmds:
-      - $COMPOSE_COMMAND down
+      - docker compose down
       - cmd: docker volume remove docker-environment_postgres_data
         ignore_error: true
       - rm -f postgres/db.sh