From 2edb9195f638019be7c5ccfd78d93fabab544412 Mon Sep 17 00:00:00 2001 From: David Palm Date: Fri, 26 Mar 2021 12:28:07 +0100 Subject: [PATCH 1/2] Dockerfile fixes --- backend/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index fb14b46..7abbf62 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,6 +1,6 @@ #### BUILDER IMAGE -- quite big one #### FROM paritytech/musl-ci-linux as builder -LABEL maintainer="Daniel Maricic daniel@woss.io" +LABEL maintainer="Parity Technologies" LABEL description="Polkadot Telemetry backend builder image" ARG PROFILE=release @@ -8,19 +8,19 @@ WORKDIR /app COPY . . -RUN cargo build --${PROFILE} --bins --target x86_64-unknown-linux-musl +RUN cargo build --${PROFILE} --bins # MAIN IMAGE FOR PEOPLE TO PULL --- small one# FROM scratch -LABEL maintainer="Daniel Maricic daniel@woss.io" +LABEL maintainer="Parity Technologies" LABEL description="Polkadot Telemetry backend, static build" ARG PROFILE=release WORKDIR /usr/local/bin COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /app/target/x86_64-unknown-linux-musl/$PROFILE/telemetry /usr/local/bin +COPY --from=builder /app/target/$PROFILE/telemetry /usr/local/bin EXPOSE 8000 From 894f7ef742f0b1ac7c270d0cdc146fff90d4f29a Mon Sep 17 00:00:00 2001 From: David Palm Date: Fri, 26 Mar 2021 12:30:12 +0100 Subject: [PATCH 2/2] merge --- backend/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5bb29ea..8178129 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,11 +1,6 @@ #### BUILDER IMAGE -- quite big one #### -<<<<<<< HEAD -FROM paritytech/musl-ci-linux as builder -LABEL maintainer="Parity Technologies" -======= FROM paritytech/ci-linux:production as builder -LABEL maintainer="Daniel Maricic daniel@woss.io" ->>>>>>> origin/master +LABEL maintainer="Parity Technologies" LABEL description="Polkadot Telemetry backend builder image" ARG PROFILE=release