Skip to content

Commit 41dcb12

Browse files
LeechaelLeechael
committed
fix builder dockerfiles and adjust ppid display
1 parent 799c92c commit 41dcb12

8 files changed

Lines changed: 92 additions & 8 deletions

File tree

‎gateway/dstack-app/Dockerfile.backup‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM rust:1.86.0@sha256:300ec56abce8cc9448ddea2172747d048ed902a3090e6b57babb2bf19f754081
2+
WORKDIR /src
3+
RUN apt-get update && apt-get install -y \
4+
git build-essential libssl-dev protobuf-compiler \
5+
libprotobuf-dev wireguard-tools iproute2 libclang-dev jq
6+
RUN git clone https://github.com/Dstack-TEE/dstack.git && \
7+
cd dstack && \
8+
git checkout ca4af023e974427e41532431b8561ce82008c0be
9+
WORKDIR /src/dstack/gateway/dstack-app
10+
RUN cargo build --release -p dstack-gateway && cp /src/dstack/target/release/dstack-gateway /src/dstack/dstack-gateway && cargo clean
11+
ENTRYPOINT ["/src/dstack/gateway/dstack-app/entrypoint.sh"]
12+
CMD ["/src/dstack/dstack-gateway", "-c", "/data/gateway/gateway.toml"]

‎gateway/dstack-app/builder/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
FROM rust:1.92.0@sha256:48851a839d6a67370c9dbe0e709bedc138e3e404b161c5233aedcf2b717366e4 AS gateway-builder
6-
COPY --from=build-shared pin-packages.sh /build/
6+
COPY --from=build-shared /pin-packages.sh /build/
77
COPY ./shared/*-pinned-packages.txt /build/
88
ARG DSTACK_REV
99
ARG DSTACK_SRC_URL=https://github.com/Dstack-TEE/dstack.git
@@ -27,7 +27,7 @@ RUN cd dstack && cargo build --release -p dstack-gateway --target x86_64-unknown
2727
RUN echo "${DSTACK_REV}" > /build/.GIT_REV
2828

2929
FROM debian:bookworm@sha256:0d8498a0e9e6a60011df39aab78534cfe940785e7c59d19dfae1eb53ea59babe
30-
COPY --from=build-shared pin-packages.sh /build/
30+
COPY --from=build-shared /pin-packages.sh /build/
3131
COPY ./shared/pinned-packages.txt /build/
3232
WORKDIR /build
3333
RUN ./pin-packages.sh ./pinned-packages.txt && \

‎kms/dstack-app/Dockerfile-dstack-helios‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM rust:1.86-alpine@sha256:661d708cc863ce32007cf46807a72062a80d2944a6fae9e0d83742d2e04d5375 AS builder
2+
RUN apk add --no-cache \
3+
git \
4+
build-base \
5+
openssl-dev \
6+
openssl-libs-static \
7+
protobuf \
8+
protobuf-dev \
9+
perl \
10+
pkgconfig
11+
RUN rustup target add x86_64-unknown-linux-musl
12+
WORKDIR /app
13+
RUN git clone https://github.com/a16z/helios && \
14+
cd helios
15+
#RUN git clone https://github.com/a16z/helios && \
16+
# cd helios && \
17+
# git checkout 5c61864a167c16141a9a12b976c0e9398b332f07
18+
WORKDIR /app/helios
19+
ENV RUSTFLAGS="-C target-feature=+crt-static"
20+
ENV PKG_CONFIG_ALLOW_CROSS=1
21+
ENV PKG_CONFIG_ALL_STATIC=1
22+
ENV OPENSSL_STATIC=1
23+
ENV OPENSSL_DIR=/usr
24+
RUN cargo build --release --target x86_64-unknown-linux-musl
25+
26+
FROM gcr.io/distroless/cc-debian12:nonroot AS runtime
27+
COPY --from=builder /app/helios/target/x86_64-unknown-linux-musl/release/helios /helios
28+
ENTRYPOINT ["/helios"]

‎kms/dstack-app/Dockerfile-dstack-kms‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
FROM golang:1.22-alpine@sha256:1699c10032ca2582ec89a24a1312d986a3f094aed3d5c1147b19880afe40e052 AS dstack-mr-builder
2+
WORKDIR /app
3+
RUN apk add --no-cache git
4+
RUN git clone https://github.com/kvinwang/dstack-mr.git
5+
WORKDIR /app/dstack-mr
6+
RUN git checkout 5cf6d917e076f3624eab1b6b662f222ece15600f
7+
RUN CGO_ENABLED=0 go build -ldflags="-extldflags -static" -o /usr/local/bin/dstack-mr
8+
9+
FROM rust:1.86.0@sha256:300ec56abce8cc9448ddea2172747d048ed902a3090e6b57babb2bf19f754081 AS kms-builder
10+
WORKDIR /app
11+
RUN apt-get update && apt-get install -y \
12+
git \
13+
build-essential \
14+
musl-tools \
15+
libssl-dev \
16+
protobuf-compiler \
17+
libprotobuf-dev \
18+
clang \
19+
libclang-dev \
20+
--no-install-recommends \
21+
&& rm -rf /var/lib/apt/lists/*
22+
RUN git clone https://github.com/Dstack-TEE/dstack.git && \
23+
cd dstack && \
24+
git checkout 13c9728f1d481af7f97dc1098394602beb4da8fe
25+
WORKDIR /app/dstack
26+
RUN rustup target add x86_64-unknown-linux-musl
27+
RUN cargo build --release -p dstack-kms --target x86_64-unknown-linux-musl
28+
29+
FROM alpine:latest
30+
COPY --from=kms-builder /app/dstack/target/x86_64-unknown-linux-musl/release/dstack-kms /usr/local/bin/dstack-kms
31+
COPY --from=kms-builder /app/dstack/kms/dstack-app/entrypoint.sh /entrypoint.sh
32+
COPY --from=dstack-mr-builder /usr/local/bin/dstack-mr /usr/local/bin/dstack-mr
33+
WORKDIR /app/kms
34+
CMD ["/entrypoint.sh"]

‎kms/dstack-app/Dockerfile-dstack-kms-auth-api‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM oven/bun:1.2.18-alpine@sha256:a7df687a2f684ee2f7404e2592039e192d75d26a04f843e60d9fc342741187d0
2+
WORKDIR /app
3+
4+
RUN apk add --no-cache git
5+
RUN git clone https://github.com/Dstack-TEE/dstack.git && \
6+
cd dstack && \
7+
git checkout ca4af023e974427e41532431b8561ce82008c0be
8+
WORKDIR /app/dstack/kms/auth-eth-bun
9+
RUN bun install --frozen-lockfile
10+
CMD bun index.ts

‎kms/dstack-app/builder/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
FROM rust:1.92.0@sha256:48851a839d6a67370c9dbe0e709bedc138e3e404b161c5233aedcf2b717366e4 AS kms-builder
6-
COPY --from=build-shared pin-packages.sh /build/
6+
COPY --from=build-shared /pin-packages.sh /build/
77
COPY ./shared/*-pinned-packages.txt /build/
88
ARG DSTACK_REV
99
ARG DSTACK_SRC_URL=https://github.com/Dstack-TEE/dstack.git
@@ -27,7 +27,7 @@ RUN cd dstack && cargo build --release -p dstack-kms --target x86_64-unknown-lin
2727
RUN echo "${DSTACK_REV}" > /build/.GIT_REV
2828

2929
FROM debian:bookworm@sha256:0d8498a0e9e6a60011df39aab78534cfe940785e7c59d19dfae1eb53ea59babe
30-
COPY --from=build-shared pin-packages.sh config-qemu.sh /build/
30+
COPY --from=build-shared /pin-packages.sh /config-qemu.sh /build/
3131
COPY ./shared/qemu-pinned-packages.txt /build/
3232
WORKDIR /build
3333
ARG QEMU_REV=dbcec07c0854bf873d346a09e87e4c993ccf2633

‎kms/src/www/onboard.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ <h3>Attestation Info (for on-chain registration)</h3>
179179
</div>
180180
<div class="info-row" v-if="attestationInfo.ppid">
181181
<span class="info-label">PPID:</span>
182-
<span class="info-value">0x{{ attestationInfo.ppid }}</span>
182+
<span class="info-value">{{ attestationInfo.ppid }}</span>
183183
</div>
184184
<div class="info-row">
185185
<span class="info-label">Device ID:</span>

‎verifier/builder/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
FROM rust:1.92.0-bookworm@sha256:e90e846de4124376164ddfbaab4b0774c7bdeef5e738866295e5a90a34a307a2 AS verifier-builder
6-
COPY --from=build-shared pin-packages.sh /build/
6+
COPY --from=build-shared /pin-packages.sh /build/
77
COPY builder/shared/*-pinned-packages.txt /build/
88
ARG DSTACK_REV
99
ARG DSTACK_SRC_URL=https://github.com/Dstack-TEE/dstack.git
@@ -31,7 +31,7 @@ RUN cd dstack && cargo build --release -p dstack-verifier --target x86_64-unknow
3131
RUN echo "${DSTACK_REV}" > /build/.GIT_REV
3232

3333
FROM debian:bookworm@sha256:0d8498a0e9e6a60011df39aab78534cfe940785e7c59d19dfae1eb53ea59babe AS acpi-builder
34-
COPY --from=build-shared pin-packages.sh config-qemu.sh /build/
34+
COPY --from=build-shared /pin-packages.sh /config-qemu.sh /build/
3535
COPY builder/shared/qemu-pinned-packages.txt /build/
3636
WORKDIR /build
3737
ARG QEMU_REV=dbcec07c0854bf873d346a09e87e4c993ccf2633
@@ -66,7 +66,7 @@ RUN git clone https://github.com/kvinwang/qemu-tdx.git --depth 1 --branch dstack
6666
cd .. && rm -rf qemu-tdx
6767

6868
FROM debian:bookworm@sha256:0d8498a0e9e6a60011df39aab78534cfe940785e7c59d19dfae1eb53ea59babe
69-
COPY --from=build-shared pin-packages.sh /build/
69+
COPY --from=build-shared /pin-packages.sh /build/
7070
COPY builder/shared/pinned-packages.txt /build/
7171
WORKDIR /build
7272
RUN ./pin-packages.sh ./pinned-packages.txt && \

0 commit comments

Comments
 (0)