condensed builds for both archs into one pipeline, removed obsolete files

Author: Benedikt-Illich

.github/workflows/containerize-and-push_arm.yaml renamed to .github/workflows/containerize-and-push.yaml

@@ -11,7 +11,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************/
 
-name: Containerize UStreamer and Push to Container Registry
+name: Containerize uStreamer and Push to Container Registry
 
 on:
   push:
@@ -27,7 +27,6 @@ env:
 jobs:
   build-binary:
     runs-on: ubuntu-latest
-    environment: production
     permissions:
       contents: read
       packages: write
@@ -73,12 +72,27 @@ jobs:
         run: |
           cross build --target aarch64-unknown-linux-musl --bin zenoh_mqtt --features="zenoh-transport mqtt-transport" --release
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image for arm64
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: "Dockerfile.zenoh_mqtt-arm-musl"
+          file: "Dockerfile.zenoh-mqtt-arm"
           push: true
           platforms: linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Cross Build for amd64
+        working-directory: example-streamer-implementations
+        run: |
+          cross build --target x86_64-unknown-linux-musl --bin zenoh_mqtt --features="zenoh-transport mqtt-transport" --release
+
+      - name: Build and push Docker image for amd64
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: "Dockerfile.zenoh-mqtt-amd"
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/containerize-and-push_amd.yaml

@@ -1,18 +1,18 @@
-[target.x86_64-unknown-linux-gnu]
-pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
-]
-
-[target.x86_64-unknown-linux-musl]
-pre-build = [
-    "apt-get update && apt-get install --assume-yes libssl-dev",
-    "export OPENSSL_ROOT_DIR=/usr",
-]
-
-[target.aarch64-unknown-linux-gnu]
-# [build.env]
-# passthrough = ["CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_gnu"]
+# ********************************************************************************
+#  Copyright (c) 2024 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************/
 
 [build.env]
-passthrough = ["CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_musl"]
+passthrough = [
+    "CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_musl",
+    "CMAKE_TOOLCHAIN_FILE_x86_64_unknown_linux_musl",
+]

Cross.toml

@@ -0,0 +1,23 @@
+# ********************************************************************************
+#  Copyright (c) 2024 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************/
+
+FROM scratch
+
+WORKDIR /app
+
+COPY target/x86_64-unknown-linux-musl/release/zenoh_mqtt /app/zenoh_mqtt
+
+EXPOSE 7447
+EXPOSE 1883
+
+CMD ["./zenoh_mqtt", "--config", "config/CONFIG.json5"]

Dockerfile.crossbuild

@@ -0,0 +1,23 @@
+# ********************************************************************************
+#  Copyright (c) 2024 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************/
+
+FROM scratch
+
+WORKDIR /app
+
+COPY target/aarch64-unknown-linux-musl/release/zenoh_mqtt /app/zenoh_mqtt
+
+EXPOSE 7447
+EXPOSE 1883
+
+CMD ["./zenoh_mqtt", "--config", "config/CONFIG.json5"]