From e10a26051a7eabed1100c1bedab8d33fa0437eec Mon Sep 17 00:00:00 2001 From: Carl Sander Date: Fri, 6 Aug 2021 14:06:19 +0000 Subject: [PATCH 1/4] added Dockerfile,entrypoint.sh --- Dockerfile | 10 ++++++++++ README.md | 5 +++++ entrypoint.sh | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 Dockerfile create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..243281e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:20.04 +RUN apt-get update && \ + apt-get install -y \ + gcc \ + make \ + && rm -rf /var/lib/apt/lists/* +COPY . /app +RUN chmod +x /app/entrypoint.sh +RUN cd /app && make && make install +ENTRYPOINT [ "/app/entrypoint.sh"] \ No newline at end of file diff --git a/README.md b/README.md index e3922d5..ac4befe 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,11 @@ To use fiche you have to have netcat installed. You probably already have it - t ``` sudo make install ``` +## Docker + +``` +docker run TBA +``` ### Using Ports on FreeBSD diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..c2c8f67 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,2 @@ +#!/bin/bash +fiche -d $DOMAIN -o /home/data \ No newline at end of file From 0670bc0b2ce07a29bf1f3df8b700a3643415f7f1 Mon Sep 17 00:00:00 2001 From: Carl Dominik Sander Date: Mon, 22 Nov 2021 20:26:28 +0000 Subject: [PATCH 2/4] added docker-compose --- docker-compose.yml | 10 ++++++++++ entrypoint.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a5986aa --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +services: + fiche: + build: . + volumes: + - /mnt/hdd/docker/fiche/data:/home/data + ports: + - 9999:9999 + environment: + - DOMAIN=tbin.eu #change to your needs + restart: always diff --git a/entrypoint.sh b/entrypoint.sh index c2c8f67..5d4baf8 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,2 +1,2 @@ #!/bin/bash -fiche -d $DOMAIN -o /home/data \ No newline at end of file +fiche -S -d $DOMAIN -o /home/data -l /home/data/log.txt From db51aec0ee36c03e5e8f5e40e012f68228ddad8c Mon Sep 17 00:00:00 2001 From: Carl Dominik Sander Date: Mon, 22 Nov 2021 20:36:10 +0000 Subject: [PATCH 3/4] changed README --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index ac4befe..83fd552 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,25 @@ WantedBy=multi-user.target __WARNING:__ In service mode you have to set output directory with `-o` parameter. +------------------------------------------------------------------------------- + +### Running with Docker + +There is a Dockerfile and a docker-compose.yml in the repository. +You can run fiche with docker by cloning the repository with: +```bash +git clone https://github.com/solusipse/fiche +``` +Edit the docker-compose.yml to your needs (change the Domain, Port and Directory). +Finaly you can run fiche by typing +``` +docker-compose up -d +``` +in your terminal in the repositories folder. + +After that, fiche should be running at the specified port and you can use a webserver to serve your files from the folder you specified on the Dockerhost. + + ------------------------------------------------------------------------------- ### Example nginx config From d3d044656dc9ae397b3f9593a145ba22a96220f1 Mon Sep 17 00:00:00 2001 From: Carl Dominik Sander Date: Mon, 22 Nov 2021 20:38:16 +0000 Subject: [PATCH 4/4] moved docker section --- README.md | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 83fd552..a4fdc30 100644 --- a/README.md +++ b/README.md @@ -132,9 +132,21 @@ To use fiche you have to have netcat installed. You probably already have it - t ``` ## Docker +### Running with Docker + +There is a Dockerfile and a docker-compose.yml in the repository. +You can run fiche with docker by cloning the repository with: +```bash +git clone https://github.com/solusipse/fiche +``` +Edit the docker-compose.yml to your needs (change the Domain, Port and Directory). +Finaly you can run fiche by typing ``` -docker run TBA +docker-compose up -d ``` +in your terminal in the repositories folder. + +After that, fiche should be running at the specified port and you can use a webserver to serve your files from the folder you specified on the Dockerhost. ### Using Ports on FreeBSD @@ -315,25 +327,6 @@ WantedBy=multi-user.target __WARNING:__ In service mode you have to set output directory with `-o` parameter. -------------------------------------------------------------------------------- - -### Running with Docker - -There is a Dockerfile and a docker-compose.yml in the repository. -You can run fiche with docker by cloning the repository with: -```bash -git clone https://github.com/solusipse/fiche -``` -Edit the docker-compose.yml to your needs (change the Domain, Port and Directory). -Finaly you can run fiche by typing -``` -docker-compose up -d -``` -in your terminal in the repositories folder. - -After that, fiche should be running at the specified port and you can use a webserver to serve your files from the folder you specified on the Dockerhost. - - ------------------------------------------------------------------------------- ### Example nginx config