Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Plane docker builds #850

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Fix Plane docker builds #850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad29fcf
Fix Plane docker builds
paulgb Dec 6, 2024
01ce867
add build-quickstart file
paulgb Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:bookworm AS builder
FROM rust:1.83-bullseye AS builder

WORKDIR /work
COPY Cargo.toml /work/
Expand All @@ -7,7 +7,7 @@ COPY dynamic-proxy/Cargo.toml /work/dynamic-proxy/Cargo.toml
COPY plane/Cargo.toml /work/plane/Cargo.toml
COPY plane/plane-tests/plane-test-macro/Cargo.toml /work/plane/plane-tests/plane-test-macro/Cargo.toml
COPY plane/plane-tests/Cargo.toml /work/plane/plane-tests/Cargo.toml
COPY plane/plane-dynamic/Cargo.toml /work/plane/plane-dynamic/Cargo.toml
COPY common/Cargo.toml /work/common/Cargo.toml

RUN mkdir /work/plane/src
RUN echo "fn main() {}" > /work/plane/src/main.rs
Expand All @@ -17,18 +17,20 @@ RUN touch /work/dynamic-proxy/src/lib.rs

RUN mkdir -p /work/plane/plane-tests/src
RUN mkdir -p /work/plane/plane-tests/plane-test-macro/src
RUN mkdir -p /work/plane/plane-dynamic/src
RUN touch /work/plane/plane-tests/plane-test-macro/src/lib.rs
RUN touch /work/plane/plane-tests/src/lib.rs
RUN touch /work/plane/plane-dynamic/src/lib.rs
RUN mkdir -p /work/common/src
RUN touch /work/common/src/lib.rs

RUN cargo build -p plane --release --locked
RUN cargo build -p plane-dynamic-proxy --release --locked
RUN cargo build -p plane-common --release --locked
RUN cargo build -p plane --release --locked

COPY .cargo .cargo
COPY .git .git
COPY plane plane
COPY dynamic-proxy dynamic-proxy
COPY common common
RUN cargo build -p plane --release --locked

FROM gcr.io/distroless/cc-debian12
Expand Down
10 changes: 6 additions & 4 deletions docker/quickstart/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =======
# Builder
# =======
FROM rust:bookworm AS builder
FROM rust:1.83-bullseye AS builder

WORKDIR /work
COPY Cargo.toml /work/
Expand All @@ -10,7 +10,7 @@ COPY dynamic-proxy/Cargo.toml /work/dynamic-proxy/Cargo.toml
COPY plane/Cargo.toml /work/plane/Cargo.toml
COPY plane/plane-tests/plane-test-macro/Cargo.toml /work/plane/plane-tests/plane-test-macro/Cargo.toml
COPY plane/plane-tests/Cargo.toml /work/plane/plane-tests/Cargo.toml
COPY plane/plane-dynamic/Cargo.toml /work/plane/plane-dynamic/Cargo.toml
COPY common/Cargo.toml /work/common/Cargo.toml

RUN mkdir /work/plane/src
RUN echo "fn main() {}" > /work/plane/src/main.rs
Expand All @@ -20,18 +20,20 @@ RUN touch /work/dynamic-proxy/src/lib.rs

RUN mkdir -p /work/plane/plane-tests/src
RUN mkdir -p /work/plane/plane-tests/plane-test-macro/src
RUN mkdir -p /work/plane/plane-dynamic/src
RUN mkdir -p /work/common/src
RUN touch /work/plane/plane-tests/plane-test-macro/src/lib.rs
RUN touch /work/plane/plane-tests/src/lib.rs
RUN touch /work/plane/plane-dynamic/src/lib.rs
RUN touch /work/common/src/lib.rs

RUN cargo build -p plane --release --locked
RUN cargo build -p plane-dynamic-proxy --release --locked
RUN cargo build -p plane --release --locked

COPY .cargo .cargo
COPY .git .git
COPY plane plane
COPY dynamic-proxy dynamic-proxy
COPY common common
RUN cargo build -p plane --release --locked

# =======
Expand Down
Loading