From 9dd416f8abaf16ebc2ff3d12a5fe7fcc9dd67bb6 Mon Sep 17 00:00:00 2001 From: ahoemann Date: Fri, 28 Mar 2025 10:27:30 +0100 Subject: [PATCH 1/4] feat: footer information for adrianux domain --- README.md | 6 ------ templates/base.j2 | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) 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/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 %}
+ -- 2.45.3 From 2f7d0f70e5918b222f0c7f2921c1f441f925d915 Mon Sep 17 00:00:00 2001 From: ahoemann Date: Fri, 28 Mar 2025 10:35:03 +0100 Subject: [PATCH 2/4] fix: redirect issue --- Dockerfile | 2 +- app.py | 2 +- paste/2f2ffb8b71cb9370 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 paste/2f2ffb8b71cb9370 diff --git a/Dockerfile b/Dockerfile index 6d544bc..e4832d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV PASTE_DIR=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/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/2f2ffb8b71cb9370 b/paste/2f2ffb8b71cb9370 new file mode 100644 index 0000000..d3c5112 --- /dev/null +++ b/paste/2f2ffb8b71cb9370 @@ -0,0 +1 @@ +tsetst \ No newline at end of file -- 2.45.3 From 49a10e95a2f83367c0f868f988363b4d1612706f Mon Sep 17 00:00:00 2001 From: ahoemann Date: Fri, 28 Mar 2025 10:39:30 +0100 Subject: [PATCH 3/4] fix: .gitignore the paste directory --- .gitignore | 1 + paste/1129250e41fd939f | 1 - paste/166df7446b9cedd2 | 1 - paste/223d486abe15baac | 1 - paste/2f2ffb8b71cb9370 | 1 - paste/5c7060da2fde6c70 | 1 - paste/5f061281b5db5798 | 1 - paste/68acc064f8c810fa | 1 - paste/700d33e6844602f6 | 1 - paste/75f8d4eae450a00d | 1 - paste/793e612cd9ebf718 | 1 - paste/7b8940f86990f32e | 1 - paste/915916ffb2addda0 | 1 - paste/95b2820464994fa2 | 1 - paste/9eb5c03c1be2404c | 1 - paste/c34c7220f89764e8 | 1 - paste/c64b23a68d8484ea | 1 - paste/c78e7f7161a150c0 | 1 - paste/ebd8f44366c8c692 | 1 - paste/test | 1 - 20 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 paste/1129250e41fd939f delete mode 100644 paste/166df7446b9cedd2 delete mode 100644 paste/223d486abe15baac delete mode 100644 paste/2f2ffb8b71cb9370 delete mode 100644 paste/5c7060da2fde6c70 delete mode 100644 paste/5f061281b5db5798 delete mode 100644 paste/68acc064f8c810fa delete mode 100644 paste/700d33e6844602f6 delete mode 100644 paste/75f8d4eae450a00d delete mode 100644 paste/793e612cd9ebf718 delete mode 100644 paste/7b8940f86990f32e delete mode 100644 paste/915916ffb2addda0 delete mode 100644 paste/95b2820464994fa2 delete mode 100644 paste/9eb5c03c1be2404c delete mode 100644 paste/c34c7220f89764e8 delete mode 100644 paste/c64b23a68d8484ea delete mode 100644 paste/c78e7f7161a150c0 delete mode 100644 paste/ebd8f44366c8c692 delete mode 100644 paste/test 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/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/2f2ffb8b71cb9370 b/paste/2f2ffb8b71cb9370 deleted file mode 100644 index d3c5112..0000000 --- a/paste/2f2ffb8b71cb9370 +++ /dev/null @@ -1 +0,0 @@ -tsetst \ 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 -- 2.45.3 From 08a155114283a3dc881daa04f49606d29b06e9d3 Mon Sep 17 00:00:00 2001 From: ahoemann Date: Fri, 28 Mar 2025 10:42:48 +0100 Subject: [PATCH 4/4] fix: .dockerignore the paste directory --- .dockerignore | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/Dockerfile b/Dockerfile index e4832d7..6fffed0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:latest WORKDIR /opt/ ENV DEBUG_MODE=False -ENV PASTE_DIR=pastes +ENV PASTE_DIR=/opt/pastes COPY . . -- 2.45.3