From 46edd0f78107c0108eb730837effe7aa1968b8ad Mon Sep 17 00:00:00 2001 From: Davide Polonio Date: Wed, 10 Nov 2021 14:59:57 +0100 Subject: [PATCH] chore(docker): upgrade Docker image and lint it --- .pre-commit-config.yaml | 4 ++++ Dockerfile | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 683049a..c0be7d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,3 +15,7 @@ repos: - id: fmt args: ['--verbose', '--'] - id: cargo-check +- repo: https://github.com/IamTheFij/docker-pre-commit + rev: v2.0.1 + hooks: + - id: hadolint diff --git a/Dockerfile b/Dockerfile index c42db36..aff8dea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ -FROM rust:1.55.0-bullseye as builder +FROM rust:1.56.1-slim-bullseye as builder -# ENV RUSTFLAGS="-C target-feature=+crt-static" WORKDIR /build -RUN apt-get update && apt-get install -y \ - libssl-dev +RUN apt-get update && apt-get install -y --no-install-recommends \ + libssl-dev=1.1.1k-1+deb11u1 \ + pkg-config=0.29.2-1 COPY ./ /build RUN cargo build --release -FROM gcr.io/distroless/base +FROM gcr.io/distroless/base:latest-amd64 COPY --from=builder /build/target/release/songlify /usr/bin/songlify COPY --from=builder /lib/x86_64-linux-gnu/libgcc_s.so.1 /lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/ -ENTRYPOINT /usr/bin/songlify +ENTRYPOINT ["/usr/bin/songlify"]