Merge pull request #27 from yilmaz08/main

Fix simple dockerfile errors
This commit is contained in:
Sayantan Santra 2024-08-28 11:49:51 -05:00 committed by GitHub
commit 0d0da1141b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions

View File

@ -4,12 +4,12 @@
FROM lukemathwalker/cargo-chef:latest-rust-slim AS chef FROM lukemathwalker/cargo-chef:latest-rust-slim AS chef
WORKDIR /chhoto-url WORKDIR /chhoto-url
FROM chef as planner FROM chef AS planner
COPY ./actix/Cargo.toml ./actix/Cargo.lock . COPY ./actix/Cargo.toml ./actix/Cargo.lock ./
COPY ./actix/src ./src COPY ./actix/src ./src
RUN cargo chef prepare --recipe-path recipe.json RUN cargo chef prepare --recipe-path recipe.json
FROM chef as builder FROM chef AS builder
ARG target=x86_64-unknown-linux-musl ARG target=x86_64-unknown-linux-musl
RUN apt-get update && apt-get install -y musl-tools RUN apt-get update && apt-get install -y musl-tools
RUN rustup target add $target RUN rustup target add $target
@ -18,12 +18,13 @@ COPY --from=planner /chhoto-url/recipe.json recipe.json
# Build dependencies - this is the caching Docker layer # Build dependencies - this is the caching Docker layer
RUN cargo chef cook --release --target=$target --recipe-path recipe.json RUN cargo chef cook --release --target=$target --recipe-path recipe.json
COPY ./actix/Cargo.toml ./actix/Cargo.lock . COPY ./actix/Cargo.toml ./actix/Cargo.lock ./
COPY ./actix/src ./src COPY ./actix/src ./src
# Build application # Build application
RUN cargo build --release --target=$target --locked --bin chhoto-url RUN cargo build --release --target=$target --locked --bin chhoto-url
RUN cp /chhoto-url/target/$target/release/chhoto-url /chhoto-url/release
FROM scratch FROM scratch
COPY --from=builder /chhoto-url/target/$target/release/chhoto-url /chhoto-url COPY --from=builder /chhoto-url/release /chhoto-url
COPY ./resources /resources COPY ./resources /resources
ENTRYPOINT ["/chhoto-url"] ENTRYPOINT ["/chhoto-url"]

View File

@ -1,13 +1,13 @@
# SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> # SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
FROM scratch as builder-amd64 FROM scratch AS builder-amd64
COPY ./actix/target/x86_64-unknown-linux-musl/release/chhoto-url /chhoto-url COPY ./actix/target/x86_64-unknown-linux-musl/release/chhoto-url /chhoto-url
FROM scratch as builder-arm64 FROM scratch AS builder-arm64
COPY ./actix/target/aarch64-unknown-linux-musl/release/chhoto-url /chhoto-url COPY ./actix/target/aarch64-unknown-linux-musl/release/chhoto-url /chhoto-url
FROM scratch as builder-arm FROM scratch AS builder-arm
COPY ./actix/target/armv7-unknown-linux-musleabihf/release/chhoto-url /chhoto-url COPY ./actix/target/armv7-unknown-linux-musleabihf/release/chhoto-url /chhoto-url
ARG TARGETARCH ARG TARGETARCH