Skip to content

Commit ae7bef3

Browse files
MossakaMossaka
committed
bump images rust version to 1.85 and wasm32-wasi -> wasm32-wasip1
Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
1 parent a86e8fb commit ae7bef3

File tree

16 files changed

+47
-45
lines changed

16 files changed

+47
-45
lines changed

‎containerd-shim-spin/quickstart.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ Navigate to the directory where you created the application:
8686
cd qs-wasm-spin
8787
```
8888

89-
Use `rustup` to install the `wasm32-wasi` target and `spin build` to build the application. For example:
89+
Use `rustup` to install the `wasm32-wasip1` target and `spin build` to build the application. For example:
9090

9191
```bash
92-
rustup target add wasm32-wasi
92+
rustup target add wasm32-wasip1
9393
spin build
9494
```
9595

@@ -131,13 +131,13 @@ You have two choices for publishing spin apps. The steps to deploy are the same
131131
Create a `Dockerfile` at the root of the application directory with the following:
132132

133133
```dockerfile
134-
FROM --platform=${BUILDPLATFORM} rust:1.71 AS build
134+
FROM --platform=${BUILDPLATFORM} rust:1.85 AS build
135135
WORKDIR /opt/build
136136
COPY . .
137-
RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
137+
RUN rustup target add wasm32-wasip1 && cargo build --target wasm32-wasip1 --release
138138

139139
FROM scratch
140-
COPY --from=build /opt/build/target/wasm32-wasi/release/qs_wasm_spin.wasm .
140+
COPY --from=build /opt/build/target/wasm32-wasip1/release/qs_wasm_spin.wasm .
141141
COPY --from=build /opt/build/spin.toml .
142142
```
143143

@@ -153,7 +153,7 @@ source = "qs_wasm_spin.wasm"
153153
Use `docker` to build the container image and push it to the k3d registry:
154154

155155
```bash
156-
docker buildx build --platform=wasi/wasm -t localhost:12345/qs-wasm-spin .
156+
docker buildx build --platform=wasip1/wasm -t localhost:12345/qs-wasm-spin .
157157
docker push localhost:12345/qs-wasm-spin:latest
158158
```
159159

‎images/spin-dapr/.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ target/debug
22
target/release
33
target/wasm32-wasi/build
44
target/wasm32-wasi/deps
5+
target/wasm32-wasip1/build
6+
target/wasm32-wasip1/deps
57
.spin/

‎images/spin-dapr/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM scratch
22
COPY ./spin.toml .
3-
COPY --chmod=0755 ./target/wasm32-wasi/release/spin_dapr.wasm /target/wasm32-wasi/release/spin_dapr.wasm
4-
ENTRYPOINT ["/target/wasm32-wasi/release/spin_dapr.wasm"]
3+
COPY --chmod=0755 ./target/wasm32-wasip1/release/spin_dapr.wasm /target/wasm32-wasip1/release/spin_dapr.wasm
4+
ENTRYPOINT ["/target/wasm32-wasip1/release/spin_dapr.wasm"]

‎images/spin-dapr/spin.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ version = "0.1.0"
77

88
[[component]]
99
id = "spin-dapr"
10-
source = "target/wasm32-wasi/release/spin_dapr.wasm"
10+
source = "target/wasm32-wasip1/release/spin_dapr.wasm"
1111
allowed_http_hosts = []
1212
[component.trigger]
1313
route = "/..."
1414

1515
[component.build]
16-
command = "cargo build --target wasm32-wasi --release"
16+
command = "cargo build --target wasm32-wasip1 --release"
1717
watch = ["src/**/*.rs", "Cargo.toml"]

‎images/spin-keyvalue/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM --platform=${BUILDPLATFORM} rust:1.71 AS build
1+
FROM --platform=${BUILDPLATFORM} rust:1.85 AS build
22
WORKDIR /opt/build
33
COPY . .
4-
RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
4+
RUN rustup target add wasm32-wasip1 && cargo build --target wasm32-wasip1 --release
55

66
FROM scratch
77
COPY --from=build /opt/build/spin.toml ./spin.toml
8-
COPY --from=build /opt/build/target/wasm32-wasi/release/spin_keyvalue.wasm ./target/wasm32-wasi/release/spin_keyvalue.wasm
8+
COPY --from=build /opt/build/target/wasm32-wasip1/release/spin_keyvalue.wasm ./target/wasm32-wasip1/release/spin_keyvalue.wasm

‎images/spin-keyvalue/spin.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ route = "/keyvalue"
1111
component = "keyvalue"
1212

1313
[component.keyvalue]
14-
source = "target/wasm32-wasi/release/spin_keyvalue.wasm"
14+
source = "target/wasm32-wasip1/release/spin_keyvalue.wasm"
1515
allowed_http_hosts = []
1616
key_value_stores = ["foo"]
1717

1818
[component.keyvalue.build]
19-
command = "cargo build --target wasm32-wasi --release"
19+
command = "cargo build --target wasm32-wasip1 --release"
2020
watch = ["src/**/*.rs", "Cargo.toml"]

‎images/spin-mqtt-message-logger/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM --platform=${BUILDPLATFORM} rust:1.73 AS build
1+
FROM --platform=${BUILDPLATFORM} rust:1.85 AS build
22
WORKDIR /opt/build
33
COPY . .
4-
RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
4+
RUN rustup target add wasm32-wasip1 && cargo build --target wasm32-wasip1 --release
55

66
FROM scratch
7-
COPY --from=build /opt/build/target/wasm32-wasi/release/mqtt_message_logger.wasm ./target/wasm32-wasi/release/mqtt_message_logger.wasm
7+
COPY --from=build /opt/build/target/wasm32-wasip1/release/mqtt_message_logger.wasm ./target/wasm32-wasip1/release/mqtt_message_logger.wasm
88
COPY --from=build /opt/build/spin.toml .

‎images/spin-mqtt-message-logger/spin.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ topic = "{{ mqtt_topic }}"
2222
qos = "1"
2323

2424
[component.mqtt-message-logger]
25-
source = "target/wasm32-wasi/release/mqtt_message_logger.wasm"
25+
source = "target/wasm32-wasip1/release/mqtt_message_logger.wasm"
2626
allowed_outbound_hosts = []
2727
[component.mqtt-message-logger.build]
28-
command = "cargo build --target wasm32-wasi --release"
28+
command = "cargo build --target wasm32-wasip1 --release"
2929
watch = ["src/**/*.rs", "Cargo.toml"]

‎images/spin-multi-trigger-app/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM --platform=${BUILDPLATFORM} rust:1.73 AS build
1+
FROM --platform=${BUILDPLATFORM} rust:1.85 AS build
22
WORKDIR /opt/build
33
COPY . .
4-
RUN rustup target add wasm32-wasi
4+
RUN rustup target add wasm32-wasip1
55

66
WORKDIR /opt/build/spin-http-trigger
7-
RUN cargo build --target wasm32-wasi --release
7+
RUN cargo build --target wasm32-wasip1 --release
88

99
WORKDIR /opt/build/spin-redis-trigger
10-
RUN cargo build --target wasm32-wasi --release
10+
RUN cargo build --target wasm32-wasip1 --release
1111

1212
FROM scratch
13-
COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm
14-
COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm
13+
COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasip1/release/spin_http_trigger.wasm spin-http-trigger/target/wasm32-wasip1/release/spin_http_trigger.wasm
14+
COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasip1/release/spin_redis_trigger.wasm spin-redis-trigger/target/wasm32-wasip1/release/spin_redis_trigger.wasm
1515
COPY --from=build /opt/build/spin.toml .

‎images/spin-multi-trigger-app/spin-redis-trigger/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM --platform=${BUILDPLATFORM} rust:1.72 AS build
1+
FROM --platform=${BUILDPLATFORM} rust:1.85 AS build
22
WORKDIR /opt/build
33
COPY . .
4-
RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
4+
RUN rustup target add wasm32-wasip1 && cargo build --target wasm32-wasip1 --release
55

66
FROM scratch
7-
COPY --from=build /opt/build/target/wasm32-wasi/release/spin_redis_trigger.wasm ./target/wasm32-wasi/release/spin_redis_trigger.wasm
7+
COPY --from=build /opt/build/target/wasm32-wasip1/release/spin_redis_trigger.wasm ./target/wasm32-wasip1/release/spin_redis_trigger.wasm
88
COPY --from=build /opt/build/spin.toml .

0 commit comments

Comments
 (0)