From 3286034ccef6e26b42ab006c111d273ddba9eb7a Mon Sep 17 00:00:00 2001 From: TiynGER Date: Tue, 8 Jun 2021 14:33:08 +0200 Subject: [PATCH] docker: modified files for local build --- Dockerfile | 8 ++------ README.md | 7 +------ rebuild.sh | 9 +++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100755 rebuild.sh diff --git a/Dockerfile b/Dockerfile index c03ba83..d48ad9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,6 @@ -FROM ubuntu +FROM python:3 -MAINTAINER Tiyn tiyn@martenkante.eu - -RUN apt-get update - -RUN apt-get install python3 python3-pip -y +MAINTAINER tiyn tiyn@mail-mk.eu COPY src /wiki diff --git a/README.md b/README.md index fed59a4..7bd4fc7 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,4 @@ Set the following ports with the -p tag. #### Example run-command -Either use the docker image `tiynger/amphora-wiki` or run -`docker build . -t amphora-wiki` in the top directory of this repository. -If so you need to change the command below apropiately -(`tiynger/amphora-wiki` to `amphora-wiki`). - -`docker run --name wiki --restart unless-stopped -v /config.py:/wiki/src/config.py -v entries:/wiki/src/templates/entry -p 80:5000 -d tiynger/amphora-wiki` +An example run command is shown in `rebuild.sh`. diff --git a/rebuild.sh b/rebuild.sh new file mode 100755 index 0000000..622248f --- /dev/null +++ b/rebuild.sh @@ -0,0 +1,9 @@ +#!/bin/sh +docker stop amphora-wiki +docker rm amphora-wiki +docker build . -t tiyn/amphora-wiki +docker run --name amphora-wiki \ + --restart unless-stopped \ + -p "5000:5000" \ + -e FLASK_ENV=development \ + -d tiyn/amphora-wiki