From a9d8e7847e43a03a8ca260f5619f6b91c5631fe5 Mon Sep 17 00:00:00 2001
From: Nicolas Belouin <nicolas.belouin@suse.com>
Date: Fri, 27 Oct 2023 15:56:27 +0200
Subject: [PATCH] Use correct credentials to push images

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
---
 .../build-onvif-video-broker-container.yml        |  4 ++--
 .../build-opcua-monitoring-broker-container.yml   |  4 ++--
 .github/workflows/build-opencv-base-container.yml |  4 ++--
 .github/workflows/build-python-app-containers.yml |  8 ++++----
 .github/workflows/build-rust-containers.yml       | 15 +++++++++++----
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-onvif-video-broker-container.yml b/.github/workflows/build-onvif-video-broker-container.yml
index 6b3e66947..dfb46d3e7 100644
--- a/.github/workflows/build-onvif-video-broker-container.yml
+++ b/.github/workflows/build-onvif-video-broker-container.yml
@@ -52,8 +52,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Build and push
       run: |
diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
index f2c15cd1a..86f425937 100644
--- a/.github/workflows/build-opcua-monitoring-broker-container.yml
+++ b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -45,8 +45,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-opencv-base-container.yml b/.github/workflows/build-opencv-base-container.yml
index dd7724efe..288544a38 100644
--- a/.github/workflows/build-opencv-base-container.yml
+++ b/.github/workflows/build-opencv-base-container.yml
@@ -60,8 +60,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-python-app-containers.yml b/.github/workflows/build-python-app-containers.yml
index b67b5cf94..0c2fc3d02 100644
--- a/.github/workflows/build-python-app-containers.yml
+++ b/.github/workflows/build-python-app-containers.yml
@@ -4,14 +4,14 @@ on:
   push:
     branches: [ main ]
     paths:
-    - .github/workflows/build-python-app-container.yml
+    - .github/workflows/build-python-app-containers.yml
     - build/containers/Dockerfile.python-app
     - samples/apps/**
     - version.txt
   pull_request:
     branches: [ main ]
     paths:
-    - .github/workflows/build-python-app-container.yml
+    - .github/workflows/build-python-app-containers.yml
     - build/containers/Dockerfile.python-app
     - samples/apps/**
     - version.txt
@@ -50,8 +50,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-rust-containers.yml b/.github/workflows/build-rust-containers.yml
index 30cb77bdd..ad8b1a7c2 100644
--- a/.github/workflows/build-rust-containers.yml
+++ b/.github/workflows/build-rust-containers.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-    - .github/workflows/build-rust-code.yml
+    - .github/workflows/build-rust-containers.yml
     - build/containers/Dockerfile.rust
     - '**.rs'
     - '**/Cargo.toml'
@@ -13,7 +13,7 @@ on:
   pull_request:
     branches: [ main ]
     paths:
-    - .github/workflows/build-rust-code.yml
+    - .github/workflows/build-rust-containers.yml
     - build/containers/Dockerfile.rust
     - '**.rs'
     - '**/Cargo.toml'
@@ -63,8 +63,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
@@ -138,6 +138,13 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
+
     - name: Docker meta
       uses: docker/metadata-action@v5
       id: meta