Skip to content

Commit 91d5f63

Browse files
authored
Fix multiplatform amd image (#85)
* Add multi images and update Rust version to 1.74 * fixed links to files * Downgrade markdown link check version to fix regression causing failure * Add container specific config.toml to fix library error while leaving local build untouched * Add multi images and update Rust version to 1.74 * fixed links to files * Add container specific config.toml to fix library error while leaving local build untouched
1 parent c9213ce commit 91d5f63

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

Dockerfile.multi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ WORKDIR /sdv
2525

2626
COPY ./ .
2727

28+
COPY ./container/cargo/config.toml ./.cargo/config.toml
29+
2830
# Check that APP_NAME argument is valid.
2931
RUN /sdv/container/scripts/argument_sanitizer.sh \
3032
--arg-value "${APP_NAME}" \

Dockerfile_integrated.multi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ WORKDIR /sdv
2525

2626
COPY ./ .
2727

28+
COPY ./container/cargo/config.toml ./.cargo/config.toml
29+
2830
# Check that APP_NAME argument is valid.
2931
RUN /sdv/container/scripts/argument_sanitizer.sh \
3032
--arg-value "${APP_NAME}" \

container/cargo/config.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT license.
3+
# SPDX-License-Identifier: MIT
4+
5+
[env]
6+
AGEMO_HOME = { value = ".agemo", relative = true }
7+
AGEMO_SAMPLES_HOME = { value = ".agemo-samples", relative = true }
8+
9+
[target.aarch64-unknown-linux-gnu]
10+
linker = "aarch64-linux-gnu-gcc"
11+
rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
12+
13+
[target.x86_64-unknown-linux-gnu]
14+
linker = "x86_64-linux-gnu-gcc"
15+
rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]

pub-sub-service/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ url = { workspace = true }
3131
uuid = { workspace = true, features = [ "v4", "fast-rng", "macro-diagnostics"] }
3232
yaml-rust = { workspace = true }
3333

34-
[target.'cfg(target_arch = "aarch64")'.dependencies]
34+
[target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64"))'.dependencies]
3535
paho-mqtt = { workspace = true, features = ["vendored-ssl"] }

0 commit comments

Comments
 (0)