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

{{ self.title() }}

{% block content %}{% endblock %}
+