From 55ef7530aee661b5bcfbb9d1c8fffb7ab5dd03f2 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 27 Mar 2023 10:23:32 +0200 Subject: [PATCH] cleaned Docker process --- Dockerfile | 5 ----- README.md | 4 ++-- default.nix | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 955e617..0000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM scratch - -ADD bottin.static /bottin - -ENTRYPOINT ["/bottin"] diff --git a/README.md b/README.md index 2fcc22d..7d0c1c9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Features: - Access control through an ACL (hardcoded in the configuration file) -A Docker image is provided on the [Docker hub](https://hub.docker.com/r/lxpz/bottin_amd64). +A Docker image is provided on the [Docker hub](https://hub.docker.com/r/dxflrs/bottin) (built in `default.nix`). An example for running Bottin on a Nomad cluster can be found in `bottin.hcl.example`. Bottin takes a single command line argument, `-config `, which is the @@ -53,7 +53,7 @@ nix-build -A docker ```bash docker load < $(nix-build -A docker) -docker push ??? +docker push dxflrs/bottin:??? ``` ## Server initialization diff --git a/default.nix b/default.nix index 35c8ba1..8cc4c8d 100644 --- a/default.nix +++ b/default.nix @@ -48,7 +48,8 @@ in rec { docker = pkgs.dockerTools.buildImage { name = "dxflrs/bottin"; config = { - Cmd = [ "${pkg}/bottin" ]; + Entrypoint = [ "${pkg}/bottin" ]; + WorkingDir = "/"; }; }; }