Transition to Native Multi-Platform Builds for Docker Images (#161)

* Update Rust Image version to 1.84 * Rewrite Release WF to use ARM runner * update actions/cache to v4.2.1
drasi-project · Mar 4, 2025 · d343738 · d343738
1 parent 9cc417b
commit d343738
Show file tree

Hide file tree

Showing 14 changed files with 418 additions and 321 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -349,7 +349,7 @@ jobs:
           go-version: '1.21'
 
       - name: Cache Go modules
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@v4
         with:
           path: |
             ~/go/pkg/mod

diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
diff --git a/control-planes/kubernetes_provider/Dockerfile b/control-planes/kubernetes_provider/Dockerfile
@@ -1,19 +1,18 @@
-# Copyright 2024 The Drasi Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder 
-# rust:1.81-bullseye
+# Copyright 2024 The Drasi Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
 
 WORKDIR /usr/src
@@ -26,7 +25,6 @@ RUN cargo fetch
 COPY ./kubernetes_provider .
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 COPY --from=builder /usr/local/cargo/bin/kubernetes_provider /usr/local/bin/kubernetes_provider
 CMD ["kubernetes_provider"]
diff --git a/control-planes/mgmt_api/Dockerfile b/control-planes/mgmt_api/Dockerfile
@@ -26,7 +26,6 @@ RUN cargo fetch
 COPY ./control-planes/mgmt_api .
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 COPY --from=builder /usr/local/cargo/bin/mgmt_api /usr/local/bin/mgmt_api
 CMD ["mgmt_api"]
diff --git a/query-container/publish-api/Dockerfile b/query-container/publish-api/Dockerfile
@@ -13,15 +13,14 @@
 # limitations under the License.
 
 FROM rust:1.84-bullseye as builder
-RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
+RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev libcurl4 && apt-get clean
 
 WORKDIR /usr/src
 COPY . .
 WORKDIR /usr/src
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/publish-api /usr/local/bin/publish-api
 CMD ["publish-api"]
diff --git a/query-container/query-host/Dockerfile b/query-container/query-host/Dockerfile
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
-RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
-
-WORKDIR /usr/src
-COPY . .
-WORKDIR /usr/src
-RUN cargo install --path .
-
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
-ENV RUST_BACKTRACE=1
-COPY --from=builder /usr/local/cargo/bin/query-host /usr/local/bin/query-host
+FROM rust:1.84-bullseye as builder
+RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
+
+WORKDIR /usr/src
+COPY . .
+WORKDIR /usr/src
+RUN cargo install --path .
+
+FROM gcr.io/distroless/cc-debian11
+ENV RUST_BACKTRACE=1
+COPY --from=builder /usr/local/cargo/bin/query-host /usr/local/bin/query-host
 CMD ["query-host"]
diff --git a/query-container/view-svc/Dockerfile b/query-container/view-svc/Dockerfile
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
-RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
-
-WORKDIR /usr/src
-COPY . .
-WORKDIR /usr/src
-RUN cargo install --force --path .
-
-FROM gcr.io/distroless/cc@sha256:3b75fdd33932d16e53a461277becf57c4f815c6cee5f6bc8f52457c095e004c8
-# gcr.io/distroless/cc 
-ENV RUST_BACKTRACE=1
-COPY --from=builder /usr/local/cargo/bin/view-svc /usr/local/bin/view-svc
+FROM rust:1.84-bullseye as builder
+RUN apt-get update && apt-get install -y protobuf-compiler cmake libc6-dev libssl-dev libclang-dev
+
+WORKDIR /usr/src
+COPY . .
+WORKDIR /usr/src
+RUN cargo install --force --path .
+
+FROM gcr.io/distroless/cc-debian11
+ENV RUST_BACKTRACE=1
+COPY --from=builder /usr/local/cargo/bin/view-svc /usr/local/bin/view-svc
 CMD ["view-svc"]
diff --git a/sources/kubernetes/kubernetes-proxy/Dockerfile b/sources/kubernetes/kubernetes-proxy/Dockerfile
@@ -1,14 +1,12 @@
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && apt-get clean
 
 WORKDIR /usr/src
 COPY . .
 WORKDIR /usr/src
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/kubernetes-proxy /usr/local/bin/kubernetes-proxy
 CMD ["kubernetes-proxy"]
diff --git a/sources/kubernetes/kubernetes-reactivator/Dockerfile b/sources/kubernetes/kubernetes-reactivator/Dockerfile
@@ -1,14 +1,12 @@
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && apt-get clean
 
 WORKDIR /usr/src
 COPY . .
 WORKDIR /usr/src
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/kubernetes-reactivator /usr/local/bin/kubernetes-reactivator
 CMD ["kubernetes-reactivator"]
diff --git a/sources/sdk/rust/example/proxy/Dockerfile b/sources/sdk/rust/example/proxy/Dockerfile
@@ -1,14 +1,12 @@
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && apt-get clean
 
 WORKDIR /usr/src
 COPY . .
 WORKDIR /usr/src
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/proxy /usr/local/bin/proxy
 CMD ["proxy"]
diff --git a/sources/sdk/rust/example/reactivator/Dockerfile b/sources/sdk/rust/example/reactivator/Dockerfile
@@ -1,14 +1,12 @@
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && apt-get clean
 
 WORKDIR /usr/src
 COPY . .
 WORKDIR /usr/src
 RUN cargo install --force --path .
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/reactivator /usr/local/bin/reactivator
 CMD ["reactivator"]
diff --git a/sources/shared/change-dispatcher/Dockerfile b/sources/shared/change-dispatcher/Dockerfile
@@ -26,8 +26,7 @@ COPY ./sources/shared/change-dispatcher .
 RUN cargo install --force --path .
 
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/change-dispatcher /usr/local/bin/change-dispatcher
 # RUN apt-get update && apt install -y openssl

diff --git a/sources/shared/change-router/Dockerfile b/sources/shared/change-router/Dockerfile
@@ -1,20 +1,18 @@
-# Copyright 2024 The Drasi Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM rust@sha256:8fae3b1a63a4dcfb6cf277a49fb5967ccbf479b9e9cee4588a077a9cb216e6d4 as builder
-# rust:1.81-bullseye
+# Copyright 2024 The Drasi Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
+FROM rust:1.84-bullseye as builder
 RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && apt-get clean
 
 WORKDIR /usr/src
@@ -28,7 +26,7 @@ COPY ./sources/shared/change-router .
 RUN cargo install --force --path .
 
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 # RUN apt-get update && apt-get install -y protobuf-compiler libcurl4 && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/cargo/bin/change-router /usr/local/bin/change-router

diff --git a/sources/shared/query-api/Dockerfile b/sources/shared/query-api/Dockerfile
@@ -26,8 +26,7 @@ COPY ./sources/shared/query-api .
 RUN cargo install --force --path .
 
 
-FROM gcr.io/distroless/cc-debian11@sha256:55a5e011b2c4246b4c51e01fcc2b452d151e03df052e357465f0392fcd59fddf
-# gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian11
 ENV RUST_BACKTRACE=1
 COPY --from=builder /usr/local/cargo/bin/query-api /usr/local/bin/query-api
 # RUN apt-get update && apt install -y openssl