From 08cd1305542e535bf21bd3fa58fe83af56521382 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Tue, 2 Mar 2021 21:44:16 +0900 Subject: [PATCH 1/4] minor fix --- docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index f84f217..e1b0f68 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,3 +5,7 @@ RUN apt-get update \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/ktaaaki/paper2html.git \ && python -m pip --no-cache-dir install -e paper2html + +EXPOSE 5000 + +CMD [ "python", "/paper2html/paper2html/main.py", "--host=0.0.0.0" ] \ No newline at end of file From 1f0512d01b75489af36cd25967c4b96d2d1a7ded Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 3 Mar 2021 18:45:52 +0900 Subject: [PATCH 2/4] add docker-compose.yml and htmlserver's Dockerfile --- docker/docker-compose.yml | 22 ++++++++++++++++++++++ docker/htmlserver.Dockerfile | 10 ++++++++++ 2 files changed, 32 insertions(+) create mode 100644 docker/docker-compose.yml create mode 100644 docker/htmlserver.Dockerfile diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..016a47a --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3" +services: + paper2html: + build: + context: . + dockerfile: Dockerfile + ports: + - "5000:5000" + volumes: + - paper:/paper_cache + + htmlserver: + build: + context: . + dockerfile: htmlserver.Dockerfile + ports: + - "8080:8080" + volumes: + - paper:/paper_cache + +volumes: + paper: diff --git a/docker/htmlserver.Dockerfile b/docker/htmlserver.Dockerfile new file mode 100644 index 0000000..1344965 --- /dev/null +++ b/docker/htmlserver.Dockerfile @@ -0,0 +1,10 @@ +FROM alpine:latest + +RUN apk update && apk add --no-cache curl unzip libc6-compat \ + && curl -s https://api.github.com/repos/mjpclab/go-http-file-server/releases/latest \ + | grep "browser_download_url.*linux-amd64.zip" | cut -d : -f 2,3 | xargs curl -JLo "ghfs.zip" \ + && unzip "ghfs.zip" \ + && rm "ghfs.zip" \ + && mkdir /paper_cache + +CMD [ "./ghfs", "-l", "8080", "-r", "/paper_cache" , "-U", "--global-delete", "--global-archive" ] \ No newline at end of file From bd6c9b365858a97507e04c8a1e84191f0676673e Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 10 Mar 2021 22:32:31 +0900 Subject: [PATCH 3/4] change to use pre-build image. --- docker/docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 016a47a..57ecb38 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,9 +1,7 @@ version: "3" services: paper2html: - build: - context: . - dockerfile: Dockerfile + image: ghcr.io/ktaaaki/paper2html:latest ports: - "5000:5000" volumes: From 0fef0c7cbb40ca711f95826fe8225544c045dfff Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 10 Mar 2021 22:41:57 +0900 Subject: [PATCH 4/4] Revert "minor fix" This reverts commit 08cd1305542e535bf21bd3fa58fe83af56521382. --- docker/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e1b0f68..f84f217 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,3 @@ RUN apt-get update \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/ktaaaki/paper2html.git \ && python -m pip --no-cache-dir install -e paper2html - -EXPOSE 5000 - -CMD [ "python", "/paper2html/paper2html/main.py", "--host=0.0.0.0" ] \ No newline at end of file