From b0ee8e2c23c5a4fc4f9124bf397d740437dcad18 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 29 Mar 2021 15:57:58 +0200 Subject: [PATCH] Fixed dockerfile --- .drone.yml | 2 +- Dockerfile | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index fe1051d..2750a14 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: password: from_secret: reg_password registry: dockerreg.gltronic.ovh - repo: gltron/nexusv7 + repo: dockerreg.gltronic.ovh/nexusv7 - name: deploy image: appleboy/drone-ssh diff --git a/Dockerfile b/Dockerfile index 4c2d1a2..4e74efe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,18 @@ # Build -FROM rust:alpine as generate -WORKDIR /usr/src/app +FROM rust as builder +WORKDIR app COPY . . -RUN cargo build --release +RUN cargo build --release --bin nexus_v7 # Generate -FROM sratch as generate -WORKDIR /usr/src/app -COPY --from=builder /usr/src/app/target/release/NexusV7 /NexusV7 -RUN NexusV7 +FROM rust as generate +WORKDIR app +COPY --from=builder /app/target/release/nexus_v7 nexus_v7 +COPY --from=builder /app/templates templates +COPY --from=builder /app/raws raws +RUN ./nexus_v7 # Serve FROM nginx as serve -COPY --from=generate /usr/src/app/generated/ /usr/share/nginx/html -COPY --from=generate /usr/src/app/resources/ /usr/share/nginx/html \ No newline at end of file +COPY --from=generate /app/generated/ /usr/share/nginx/html +COPY --from=builder /app/resources/ /usr/share/nginx/html \ No newline at end of file