diff --git a/.dockerignore b/.dockerignore index b8d9075..ade01cc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,4 +5,3 @@ Dockerfile Jenkinsfile LICENSE README.md -paste* diff --git a/.gitignore b/.gitignore index 8fbdcab..e2efa92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .venv* .env __pycache__ -paste* diff --git a/Dockerfile b/Dockerfile index 6fffed0..6d544bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ FROM alpine:latest WORKDIR /opt/ ENV DEBUG_MODE=False -ENV PASTE_DIR=/opt/pastes +ENV PASTE_DIR=pastes COPY . . -RUN apk add --no-cache python3 py3-flask py3-waitress +RUN apk add --no-cache python3 py3-flask py3-waitress cron EXPOSE 8080 diff --git a/README.md b/README.md index 5b6375e..8d7d52e 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,12 @@ waitress-serve --listen=0.0.0.0:8080 app:app # Docker +## Building the container + +```sh +docker build -t adrianux:latest . +``` + ## Running the container ```sh diff --git a/app.py b/app.py index 7be3a2f..dbe1486 100644 --- a/app.py +++ b/app.py @@ -28,7 +28,7 @@ def bin(): def view_paste(paste_id): file_path = os.path.join(paste_dir, paste_id) if not os.path.exists(file_path): - return redirect("/", code=302) + return redirect("http://localhost:5000", code=302) with open(file_path, 'r') as f: content = f.read() diff --git a/paste/1129250e41fd939f b/paste/1129250e41fd939f new file mode 100644 index 0000000..77356c3 --- /dev/null +++ b/paste/1129250e41fd939f @@ -0,0 +1 @@ +test diff --git a/paste/166df7446b9cedd2 b/paste/166df7446b9cedd2 new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/paste/166df7446b9cedd2 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/paste/223d486abe15baac b/paste/223d486abe15baac new file mode 100644 index 0000000..412836d --- /dev/null +++ b/paste/223d486abe15baac @@ -0,0 +1 @@ +basr \ No newline at end of file diff --git a/paste/5c7060da2fde6c70 b/paste/5c7060da2fde6c70 new file mode 100644 index 0000000..32f64f4 --- /dev/null +++ b/paste/5c7060da2fde6c70 @@ -0,0 +1 @@ +t \ No newline at end of file diff --git a/paste/5f061281b5db5798 b/paste/5f061281b5db5798 new file mode 100644 index 0000000..9d5bfbb --- /dev/null +++ b/paste/5f061281b5db5798 @@ -0,0 +1 @@ +VW Polo 9n3 1.2 \ No newline at end of file diff --git a/paste/68acc064f8c810fa b/paste/68acc064f8c810fa new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/paste/68acc064f8c810fa @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/paste/700d33e6844602f6 b/paste/700d33e6844602f6 new file mode 100644 index 0000000..77356c3 --- /dev/null +++ b/paste/700d33e6844602f6 @@ -0,0 +1 @@ +test diff --git a/paste/75f8d4eae450a00d b/paste/75f8d4eae450a00d new file mode 100644 index 0000000..f079749 --- /dev/null +++ b/paste/75f8d4eae450a00d @@ -0,0 +1 @@ +test1 \ No newline at end of file diff --git a/paste/793e612cd9ebf718 b/paste/793e612cd9ebf718 new file mode 100644 index 0000000..73c1790 --- /dev/null +++ b/paste/793e612cd9ebf718 @@ -0,0 +1 @@ +tset \ No newline at end of file diff --git a/paste/7b8940f86990f32e b/paste/7b8940f86990f32e new file mode 100644 index 0000000..73c1790 --- /dev/null +++ b/paste/7b8940f86990f32e @@ -0,0 +1 @@ +tset \ No newline at end of file diff --git a/paste/915916ffb2addda0 b/paste/915916ffb2addda0 new file mode 100644 index 0000000..32f64f4 --- /dev/null +++ b/paste/915916ffb2addda0 @@ -0,0 +1 @@ +t \ No newline at end of file diff --git a/paste/95b2820464994fa2 b/paste/95b2820464994fa2 new file mode 100644 index 0000000..77356c3 --- /dev/null +++ b/paste/95b2820464994fa2 @@ -0,0 +1 @@ +test diff --git a/paste/9eb5c03c1be2404c b/paste/9eb5c03c1be2404c new file mode 100644 index 0000000..b0168f3 --- /dev/null +++ b/paste/9eb5c03c1be2404c @@ -0,0 +1 @@ +doo \ No newline at end of file diff --git a/paste/c34c7220f89764e8 b/paste/c34c7220f89764e8 new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/paste/c34c7220f89764e8 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/paste/c64b23a68d8484ea b/paste/c64b23a68d8484ea new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/paste/c64b23a68d8484ea @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/paste/c78e7f7161a150c0 b/paste/c78e7f7161a150c0 new file mode 100644 index 0000000..412836d --- /dev/null +++ b/paste/c78e7f7161a150c0 @@ -0,0 +1 @@ +basr \ No newline at end of file diff --git a/paste/ebd8f44366c8c692 b/paste/ebd8f44366c8c692 new file mode 100644 index 0000000..73c1790 --- /dev/null +++ b/paste/ebd8f44366c8c692 @@ -0,0 +1 @@ +tset \ No newline at end of file diff --git a/paste/test b/paste/test new file mode 100644 index 0000000..e3ee46c --- /dev/null +++ b/paste/test @@ -0,0 +1 @@ +test diff --git a/templates/base.j2 b/templates/base.j2 index 21342c4..1a67540 100644 --- a/templates/base.j2 +++ b/templates/base.j2 @@ -14,9 +14,5 @@