Skip to content

Commit

Permalink
fix: docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
ngutech21 committed Mar 30, 2024
1 parent bc65562 commit d3970b3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
target
**/target
data
tmp
conf
.git


2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build backend
FROM rust:1.76-slim-bullseye as rust-builder
FROM rust:1.77.0-slim-bullseye as rust-builder
RUN apt update && apt install -y make clang pkg-config protobuf-compiler

WORKDIR /rust-app
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build backend
FROM rust:1.76-slim-bullseye as rust-builder
FROM rust:1.77.0-slim-bullseye as rust-builder
RUN apt update && apt install -y musl-tools musl-dev make clang pkg-config protobuf-compiler
RUN update-ca-certificates
RUN rustup target add x86_64-unknown-linux-musl
Expand All @@ -10,7 +10,7 @@ COPY . /rust-app
RUN cargo build --package moksha-mint --release --target x86_64-unknown-linux-musl


FROM alpine:latest
FROM alpine:3.19.1
RUN apk --no-cache add ca-certificates
COPY --from=rust-builder /rust-app/target/x86_64-unknown-linux-musl/release/moksha-mint /app/

Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ run-itests: _check-docker

# build the mint docker-image
build-docker:
docker build --build-arg COMMITHASH=$(git rev-parse HEAD) --build-arg BUILDTIME=$(date -u '+%F-%T') -t moksha-mint:latest .
docker build --file Dockerfile.alpine --build-arg COMMITHASH=$(git rev-parse HEAD) --build-arg BUILDTIME=$(date -u '+%F-%T') -t moksha-mint:latest .


# compile all rust crates, that are relevant for the client, to wasm
Expand Down

0 comments on commit d3970b3

Please sign in to comment.