From 56d0a3b7364a51fbaf3fe6f602e801692b4745a3 Mon Sep 17 00:00:00 2001 From: orhun Date: Mon, 14 Dec 2020 22:36:45 +0300 Subject: [PATCH] chore: Update Dockerfile about dependencies --- CHANGELOG.md | 1 + Dockerfile | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb70949..ae020a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Update kmon.8 to include string "kmod" ([#24](https://github.com/orhun/kmon/issues/24)) - Update Cargo.toml about project details +- Update Dockerfile about image and dependency versions ### Removed - Remove snapcraft.yaml diff --git a/Dockerfile b/Dockerfile index 69001a2..4a783b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ # Build Image FROM rust:1.48-slim-buster as cargo-build RUN apt-get update && apt-get install -y --no-install-recommends \ - libxcb-shape0-dev=1.12-1 libxcb-xfixes0-dev=1.12-1 --allow-unauthenticated \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + libxcb1-dev=1.13.1-2 libxcb-shape0-dev=1.13.1-2 libxcb-xfixes0-dev=1.13.1-2 \ + python3 --allow-unauthenticated \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* WORKDIR /app/ COPY Cargo.toml Cargo.toml RUN mkdir src/ && echo "fn main() {println!(\"failed to build\")}" > src/main.rs @@ -16,9 +17,10 @@ RUN mkdir -p build-out && cp target/release/kmon build-out/ # Runtime Image FROM debian:buster-slim as runtime-image RUN apt-get update && apt-get install -y --no-install-recommends \ - libxcb-shape0-dev=1.12-1 libxcb-xfixes0-dev=1.12-1 kmod=23-2 --allow-unauthenticated \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + libxcb1-dev=1.13.1-2 libxcb-shape0-dev=1.13.1-2 libxcb-xfixes0-dev=1.13.1-2 \ + kmod=26-1 --allow-unauthenticated \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* WORKDIR /root/ COPY --from=cargo-build /app/build-out/kmon . CMD ["./kmon"]