From df5c8c7d4fc05c8454341132fa6c2038781507c1 Mon Sep 17 00:00:00 2001 From: Slack Coder Date: Thu, 27 Jul 2023 07:40:06 -0500 Subject: [PATCH] docker: Make Dockerfile easier to read Avoid long lines by separating commands and arguments with '\'. --- radicle-httpd/Dockerfile | 18 ++++++++++++++---- radicle-node/Dockerfile | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/radicle-httpd/Dockerfile b/radicle-httpd/Dockerfile index e87728cb..51c9aeeb 100644 --- a/radicle-httpd/Dockerfile +++ b/radicle-httpd/Dockerfile @@ -6,15 +6,25 @@ COPY . /workdir RUN rustup target add x86_64-unknown-linux-musl WORKDIR /workdir/radicle-httpd -RUN RUSTFLAGS=-Cforce-frame-pointers=yes cargo build --profile=container --target=x86_64-unknown-linux-musl -RUN objcopy --compress-debug-sections /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd.compressed +RUN RUSTFLAGS=-Cforce-frame-pointers=yes \ + cargo build \ + --profile=container \ + --target=x86_64-unknown-linux-musl +RUN objcopy \ + --compress-debug-sections \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd.compressed # Run FROM debian:bullseye-slim@sha256:25f10b4f1ded5341a3ca0a30290ff3cd5639415f0c5a2222d5e7d5dd72952aa1 RUN echo deb http://deb.debian.org/debian bullseye-backports main contrib non-free >/etc/apt/sources.list.d/backports.list -RUN apt-get update && apt -t bullseye-backports install --yes git && rm -rf /var/lib/apt/lists/* -COPY --from=build /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd.compressed /usr/local/bin/radicle-httpd +RUN apt-get update && \ + apt -t bullseye-backports install --yes git && \ + rm -rf /var/lib/apt/lists/* +COPY --from=build \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-httpd.compressed \ + /usr/local/bin/radicle-httpd WORKDIR /app diff --git a/radicle-node/Dockerfile b/radicle-node/Dockerfile index ac3e058b..5a0c9200 100644 --- a/radicle-node/Dockerfile +++ b/radicle-node/Dockerfile @@ -7,15 +7,25 @@ RUN rustup target add x86_64-unknown-linux-musl WORKDIR /workdir/radicle-node -RUN RUSTFLAGS=-Cforce-frame-pointers=yes cargo build --profile=container --target=x86_64-unknown-linux-musl -RUN objcopy --compress-debug-sections /workdir/target/x86_64-unknown-linux-musl/container/radicle-node /workdir/target/x86_64-unknown-linux-musl/container/radicle-node.compressed +RUN RUSTFLAGS=-Cforce-frame-pointers=yes \ + cargo build \ + --profile=container \ + --target=x86_64-unknown-linux-musl +RUN objcopy \ + --compress-debug-sections \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-node \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-node.compressed # Run FROM debian:bullseye-slim@sha256:25f10b4f1ded5341a3ca0a30290ff3cd5639415f0c5a2222d5e7d5dd72952aa1 RUN echo deb http://deb.debian.org/debian bullseye-backports main contrib non-free >/etc/apt/sources.list.d/backports.list -RUN apt-get update && apt -t bullseye-backports install --yes git && rm -rf /var/lib/apt/lists/* -COPY --from=build /workdir/target/x86_64-unknown-linux-musl/container/radicle-node.compressed /usr/local/bin/radicle-node +RUN apt-get update && \ + apt -t bullseye-backports install --yes git && \ + rm -rf /var/lib/apt/lists/* +COPY --from=build \ + /workdir/target/x86_64-unknown-linux-musl/container/radicle-node.compressed \ + /usr/local/bin/radicle-node WORKDIR /app