From c5b0a8ef79c9999884bd8330c33ce141f5cac76c Mon Sep 17 00:00:00 2001 From: Jade Date: Sun, 5 Mar 2023 17:02:18 +0100 Subject: [PATCH] docker! --- Dockerfile | 8 ++++---- README.md | 2 +- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a408c49..4fb8ae3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:latest as build +FROM docker.io/rust:latest as build WORKDIR /app @@ -12,7 +12,7 @@ RUN \ cargo build --release # https://hub.docker.com/r/bitnami/minideb -FROM bitnami/minideb:latest +FROM docker.io/bitnami/minideb:latest # microbin will be in /app WORKDIR /app @@ -28,8 +28,8 @@ COPY --from=build \ # copy built executable COPY --from=build \ - /app/target/release/microbin \ - /usr/bin/microbin + /app/target/release/karton \ + /usr/bin/karton # Expose webport used for the webserver to the docker runtime EXPOSE 8080 diff --git a/README.md b/README.md index b41097a..0a32b51 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This is a fork of [MicroBin](https://github.com/szabodanika/microbin). - [ ] Distribution - [ ] nixpkgs - [x] crates.io - - [ ] Docker + - [x] Docker hub - [ ] Various other distribution specific repositories? - [ ] Quality diff --git a/flake.nix b/flake.nix index d455ca4..c5fcff0 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ { defaultPackage = naersk-lib.buildPackage ./.; devShell = with pkgs; mkShell { - buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy cargo-watch ]; + buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy cargo-watch podman ]; RUST_SRC_PATH = rustPlatform.rustLibSrc; }; });