Upgrade from Buster to Bullseye Docker images (#607)

* Upgrade from Buster to Bullseye Docker images Signed-off-by: jbpaux <[email protected]> * Update USE_OPENCV_BASE_VERSION Signed-off-by: jbpaux <[email protected]> * Update patch version Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- Signed-off-by: jbpaux <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
project-akri · Jun 28, 2023 · 08c9ac7 · 08c9ac7
1 parent 3c8c62f
commit 08c9ac7
Show file tree

Hide file tree

Showing 34 changed files with 69 additions and 69 deletions.
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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/build/akri-containers.mk b/build/akri-containers.mk
@@ -1,4 +1,4 @@
-USE_OPENCV_BASE_VERSION = 0.0.9
+USE_OPENCV_BASE_VERSION = 0.0.11
 
 # Akri container defines
 include build/akri-rust-containers.mk

diff --git a/build/akri-dotnet-containers.mk b/build/akri-dotnet-containers.mk
@@ -54,15 +54,15 @@ define add_opcua_target
 
   $(1)-build-amd64:
   ifeq (1, ${BUILD_AMD64})
-	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(AMD64_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-buster-slim --build-arg DOTNET_PUBLISH_RUNTIME=linux-x64
+	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(AMD64_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-bullseye-slim --build-arg DOTNET_PUBLISH_RUNTIME=linux-x64
   endif
   $(1)-build-arm32:
   ifeq (1, ${BUILD_ARM32})
-	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-buster-slim-$(ARM32V7_SUFFIX) --build-arg DOTNET_PUBLISH_RUNTIME=linux-arm
+	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-bullseye-slim-$(ARM32V7_SUFFIX) --build-arg DOTNET_PUBLISH_RUNTIME=linux-arm
   endif
   $(1)-build-arm64:
   ifeq (1, ${BUILD_ARM64})
-	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-buster-slim-$(ARM64V8_SUFFIX) --build-arg DOTNET_PUBLISH_RUNTIME=linux-arm64
+	docker build $(CACHE_OPTION) -f $(DOCKERFILE_DIR)/Dockerfile.$(2) . -t $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX) --build-arg OUTPUT_PLATFORM_TAG=3.1-bullseye-slim-$(ARM64V8_SUFFIX) --build-arg DOTNET_PUBLISH_RUNTIME=linux-arm64
   endif
 
   $(1)-docker-per-arch-amd64:

diff --git a/build/containers/Dockerfile.agent b/build/containers/Dockerfile.agent
@@ -1,10 +1,10 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG PLATFORM
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.agent-full b/build/containers/Dockerfile.agent-full
@@ -1,10 +1,10 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG PLATFORM
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.anomaly-detection-app b/build/containers/Dockerfile.anomaly-detection-app
@@ -1,10 +1,10 @@
 ARG PLATFORM=amd64
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 
 # Avoid tzdata prompt 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim" && \
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim" && \
     apt-get update && \
     apt-get install -y protobuf-compiler libprotoc-dev python3-pip \
     python3-grpcio python3-sklearn && \

diff --git a/build/containers/Dockerfile.controller b/build/containers/Dockerfile.controller
@@ -1,9 +1,9 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.debug-echo-discovery b/build/containers/Dockerfile.debug-echo-discovery
@@ -1,9 +1,9 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.onvif-discovery b/build/containers/Dockerfile.onvif-discovery
@@ -1,9 +1,9 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.onvif-video-broker b/build/containers/Dockerfile.onvif-video-broker
@@ -1,10 +1,10 @@
-ARG BUILD_PLATFORM_TAG=3.1-buster
-ARG OUTPUT_PLATFORM_TAG=3.1-buster-slim
+ARG BUILD_PLATFORM_TAG=3.1-bullseye
+ARG OUTPUT_PLATFORM_TAG=3.1-bullseye-slim
 ARG DOTNET_PUBLISH_RUNTIME=linux-x64
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${BUILD_PLATFORM_TAG} AS build
+FROM mcr.microsoft.com/dotnet/sdk:${BUILD_PLATFORM_TAG} AS build
 ARG BUILD_PLATFORM_TAG
-RUN echo "Build base image: mcr.microsoft.com/dotnet/core/sdk:${BUILD_PLATFORM_TAG}"
+RUN echo "Build base image: mcr.microsoft.com/dotnet/sdk:${BUILD_PLATFORM_TAG}"
 
 WORKDIR /src
 COPY ["samples/brokers/onvif-video-broker/onvif-video-broker.csproj", "."]

diff --git a/build/containers/Dockerfile.opcua-discovery b/build/containers/Dockerfile.opcua-discovery
@@ -1,9 +1,9 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.opcua-monitoring-broker b/build/containers/Dockerfile.opcua-monitoring-broker
@@ -1,10 +1,10 @@
-ARG BUILD_PLATFORM_TAG=3.1-buster
-ARG OUTPUT_PLATFORM_TAG=3.1-buster-slim
+ARG BUILD_PLATFORM_TAG=3.1-bullseye
+ARG OUTPUT_PLATFORM_TAG=3.1-bullseye-slim
 ARG DOTNET_PUBLISH_RUNTIME=linux-x64
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${BUILD_PLATFORM_TAG} AS build
+FROM mcr.microsoft.com/dotnet/sdk:${BUILD_PLATFORM_TAG} AS build
 ARG BUILD_PLATFORM_TAG
-RUN echo "Build base image: mcr.microsoft.com/dotnet/core/sdk:${BUILD_PLATFORM_TAG}"
+RUN echo "Build base image: mcr.microsoft.com/dotnet/sdk:${BUILD_PLATFORM_TAG}"
 
 WORKDIR /src
 COPY ["samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj", "."]
@@ -15,9 +15,9 @@ ARG DOTNET_PUBLISH_RUNTIME
 RUN echo "Publishing to: ${DOTNET_PUBLISH_RUNTIME}"
 RUN dotnet publish -r ${DOTNET_PUBLISH_RUNTIME} "opcua-monitoring-broker.csproj" -c Release -o /app/publish
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:${OUTPUT_PLATFORM_TAG} AS final
+FROM mcr.microsoft.com/dotnet/aspnet:${OUTPUT_PLATFORM_TAG} AS final
 ARG OUTPUT_PLATFORM_TAG
-RUN echo "Output base image: mcr.microsoft.com/dotnet/core/aspnet:${OUTPUT_PLATFORM_TAG}"
+RUN echo "Output base image: mcr.microsoft.com/dotnet/aspnet:${OUTPUT_PLATFORM_TAG}"
 
 WORKDIR /app
 COPY --from=build /app/publish .

diff --git a/build/containers/Dockerfile.udev-discovery b/build/containers/Dockerfile.udev-discovery
@@ -1,9 +1,9 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.udev-video-broker b/build/containers/Dockerfile.udev-video-broker
@@ -1,8 +1,8 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 ARG CROSS_BUILD_TARGET
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}"
 
 # Link the container to the Akri repository

diff --git a/build/containers/Dockerfile.video-streaming-app b/build/containers/Dockerfile.video-streaming-app
@@ -1,10 +1,10 @@
 ARG PLATFORM=amd64
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 
 # Avoid tzdata prompt 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim" && \
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim" && \
     apt-get update && \
     apt-get install -y protobuf-compiler libprotoc-dev python3-pip python3-grpcio python3-kubernetes && \
     apt-get clean && \

diff --git a/build/containers/Dockerfile.webhook-configuration b/build/containers/Dockerfile.webhook-configuration
@@ -1,11 +1,11 @@
 ARG PLATFORM=amd64
 ARG CROSS_BUILD_TARGET=x86_64-unknown-linux-gnu
 
-FROM ${PLATFORM}/debian:buster-slim
+FROM ${PLATFORM}/debian:bullseye-slim
 
 ARG CROSS_BUILD_TARGET
 ARG BUILD_TYPE=release
-RUN echo "Creating container based on ${PLATFORM}/debian:buster-slim"
+RUN echo "Creating container based on ${PLATFORM}/debian:bullseye-slim"
 RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}"
 
 # Link the container to the Akri repository

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.10.14"
+version = "0.10.15"
 authors = ["<[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

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.10.14
+version: 0.10.15
 
 # 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.10.14
+appVersion: 0.10.15
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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

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.10.14"
+version = "0.10.15"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"