Fix build issues (#676)

* Fix small errors in onvif broker and opencv base build workflows Signed-off-by: Nicolas Belouin <[email protected]> * Use correct credentials to push images Signed-off-by: Nicolas Belouin <[email protected]> * Update patch version Signed-off-by: Nicolas Belouin <[email protected]> * fix OpenCV workflow triggers Signed-off-by: Nicolas Belouin <[email protected]> --------- Signed-off-by: Nicolas Belouin <[email protected]>
project-akri · Nov 16, 2023 · 0e834a6 · 0e834a6
1 parent f7fac38
commit 0e834a6
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 52 deletions.
diff --git a/.github/workflows/build-onvif-video-broker-container.yml b/.github/workflows/build-onvif-video-broker-container.yml
@@ -49,13 +49,14 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       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: |
-        make onvif-video-broker $(${{ github.event_name != 'pull_request' }} && echo "PUSH=1")
+        make onvif-video-broker PREFIX=ghcr.io/project-akri/akri $(${{ github.event_name != 'pull_request' }} && echo "PUSH=1")
 
diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -42,11 +42,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       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
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
     paths:
-    - .github/actions/build-intermediate/**
     - .github/workflows/build-opencv-base-container.yml
     - build/containers/intermediate/Dockerfile.opencvsharp-build
     - build/intermediate-containers.mk
@@ -13,13 +12,10 @@ on:
     types: [opened, synchronize, reopened, labeled]
     branches: [ main ]
     paths:
-    - .github/actions/build-intermediate/**
     - .github/workflows/build-opencv-base-container.yml
     - build/containers/intermediate/Dockerfile.opencvsharp-build
     - build/intermediate-containers.mk
     - Makefile
-  issue_comment:
-    types: [created, edited]
 
 env:
   AKRI_COMPONENT: opencvsharp-build
@@ -57,11 +53,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       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
@@ -73,7 +70,7 @@ jobs:
           org.opencontainers.image.description=Akri opencvsharp base image for samples build
         tags: |
           type=ref,event=pr
-          type=raw,value=${{steps.version-string.outputs.version}}
+          type=raw,value=${{steps.version-string.outputs.BUILD_OPENCV_BASE_VERSION}}
 
     - name: Build and push
       uses: docker/build-push-action@v5

diff --git 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
@@ -47,11 +47,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       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
@@ -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'
@@ -60,11 +60,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       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 +139,14 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
+      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

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"

diff --git a/build/intermediate-containers.mk b/build/intermediate-containers.mk
@@ -1,4 +1,4 @@
-BUILD_OPENCV_BASE_VERSION = 0.1.0
+BUILD_OPENCV_BASE_VERSION = 0.1.1
 
 #
 #

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["<[email protected]>", "<[email protected]>"]
 edition = "2018"

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.16
+version: 0.12.17
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.12.16
+appVersion: 0.12.17
diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.12.16"
+version = "0.12.17"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"