Fix build tags (#680)

* Fix remaining tag issues This fixes the remaining container tag issues: - Missing "v" before version string - Typo in docker buildx imagetools command (missing "s" to imagetools) - Remove "-handler" suffix to container names for discovery handlers Signed-off-by: Nicolas Belouin <[email protected]> * Update patch version Signed-off-by: Nicolas Belouin <[email protected]> --------- Signed-off-by: Nicolas Belouin <[email protected]>
project-akri · Nov 16, 2023 · 9fe0150 · 9fe0150
1 parent 0e834a6
commit 9fe0150
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 45 deletions.
diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -59,9 +59,9 @@ jobs:
           org.opencontainers.image.description="Akri sample OPC UA monitoring broker"
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - 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
@@ -64,9 +64,9 @@ jobs:
           org.opencontainers.image.description=Akri Sample App
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5

diff --git a/.github/workflows/build-rust-containers.yml b/.github/workflows/build-rust-containers.yml
@@ -76,9 +76,9 @@ jobs:
           org.opencontainers.image.title=akri-${{matrix.component.label}}
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5
@@ -126,6 +126,7 @@ jobs:
       id: version-string
       run: |
         echo "version=$(cat version.txt)" >> $GITHUB_OUTPUT
+        echo "component_tag=$(echo "${{ matrix.component.label }}" | sed 's/-handler$//')" >> $GITHUB_OUTPUT
 
     - name: Cache Docker layers
       uses: actions/cache/restore@v3
@@ -151,14 +152,14 @@ jobs:
       uses: docker/metadata-action@v5
       id: meta
       with:
-        images: ghcr.io/project-akri/akri/${{ matrix.component.label }}
+        images: ghcr.io/project-akri/akri/${{steps.version-string.outputs.component_tag}}
         labels: |
           org.opencontainers.image.title=akri-${{matrix.component.label}}
         tags: |
           type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=raw,value=${{steps.version-string.outputs.version}},enable=${{github.event_name != 'release'}}
+          type=semver,pattern=v{{version}}
+          type=semver,pattern=v{{major}}.{{minor}}
+          type=raw,value=v${{steps.version-string.outputs.version}}-dev,enable=${{github.event_name != 'release'}}
 
     - name: Build and push
       uses: docker/build-push-action@v5

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.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"

diff --git a/build/samples.mk b/build/samples.mk
@@ -14,7 +14,7 @@ onvif-video-broker: onvif-video-broker-multiarch
 
 onvif-video-broker-multiarch: onvif-video-broker-amd64 onvif-video-broker-arm64 onvif-video-broker-arm32
 ifeq (1, $(PUSH))
-	docker buildx imagetool create --tag "$(PREFIX)/onvif-video-broker:$(LABEL_PREFIX)" 
+	docker buildx imagetools create --tag "$(PREFIX)/onvif-video-broker:$(LABEL_PREFIX)"
 endif
 
 ONVIF_BUILDX_PUSH_OUTPUT = type=image,name=$(PREFIX)/onvif-video-broker,push-by-digest=true,name-canonical=true,push=true

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.12.17"
+version = "0.12.18"
 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.17
+version: 0.12.18
 
 # 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.17
+appVersion: 0.12.18
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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 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.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"

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

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.12.17
+0.12.18
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.12.17"
+version = "0.12.18"
 license = "Apache-2.0"
 authors = ["DazWilkin <[email protected]>"]
 edition = "2018"