Skip to content

Commit 0173a86

Browse files
committed
maybe fix containers
1 parent 35b2872 commit 0173a86

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.github/workflows/build_docker_arm64.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ jobs:
4848
uses: actions-rs/toolchain@v1
4949
with:
5050
toolchain: stable
51-
target: aarch64-unknown-linux-musl
51+
target: aarch64-unknown-linux-gnu
5252
override: true
5353

54-
- name: Install musl-tools
55-
run: sudo apt-get update && sudo apt-get install -y musl-tools
56-
5754
- name: Install cargo-binstall
5855
uses: cargo-bins/cargo-binstall@main
5956

.github/workflows/build_docker_x86_64.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ jobs:
4848
uses: actions-rs/toolchain@v1
4949
with:
5050
toolchain: stable
51-
target: x86_64-unknown-linux-musl
51+
target: x86_64-unknown-linux-gnu
5252
override: true
5353

54-
- name: Install musl-tools
55-
run: sudo apt-get update && sudo apt-get install -y musl-tools
56-
5754
- name: Install cargo-binstall
5855
uses: cargo-bins/cargo-binstall@main
5956

aarch64.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Builder with Rust environment
2-
FROM --platform=linux/aarch64 alpine:latest AS builder
2+
FROM --platform=linux/aarch64 ubuntu:latest AS builder
33

44
# Prepare the working directory
55
WORKDIR /app
@@ -11,7 +11,7 @@ COPY target/dx/web/release/web/web /app/pslink
1111
RUN cd /app && ./pslink demo
1212

1313
# Stage 2: Minimal image for execution
14-
FROM --platform=linux/aarch64 scratch
14+
FROM --platform=linux/aarch64 ubuntu:latest
1515

1616
# Copy files from builder
1717
COPY --from=builder /app/ /app/

x86_64.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Builder with Rust environment
2-
FROM --platform=linux/x86_64 alpine AS builder
2+
FROM --platform=linux/x86_64 ubuntu:latest AS builder
33

44
# Prepare the working directory
55
WORKDIR /app
@@ -11,7 +11,7 @@ COPY target/dx/web/release/web/web /app/pslink
1111
RUN cd /app && ./pslink demo
1212

1313
# Stage 2: Minimal image for execution
14-
FROM --platform=linux/x86_64 scratch
14+
FROM --platform=linux/x86_64 ubuntu:latest
1515

1616
# Copy files from builder
1717
COPY --from=builder /app/ /app/

0 commit comments

Comments
 (0)