From f2a884df93df85b68d6f9cb69062998624e25cc3 Mon Sep 17 00:00:00 2001 From: xizeyoupan <44920131+xizeyoupan@users.noreply.github.com> Date: Mon, 3 Jul 2023 23:36:31 +0800 Subject: [PATCH] fix:url --- .github/workflows/publish.yml | 8 +++++++- Dockerfile | 2 +- app.py | 2 +- requirements.txt | 4 ++-- templates/base.html | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e644912..8b9eac5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,6 +23,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ secrets.DOCKERHUB_USERNAME }}/kinss + - name: Build and push docker image uses: docker/build-push-action@v2 with: @@ -31,7 +37,7 @@ jobs: push: true tags: | ${{ secrets.DOCKERHUB_USERNAME }}/kinss:latest - ${{ secrets.DOCKERHUB_USERNAME }}/kinss:1.1 + ${{ steps.meta.outputs.tags }} - name: Depoly to flyio, using fly.toml uses: superfly/flyctl-actions@master diff --git a/Dockerfile b/Dockerfile index b4db84c..2d8f772 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ RUN python -m pip install -U --force-reinstall pip \ && pip install -r /code/requirements.txt WORKDIR /code -CMD ["python", "/code/app.py"] \ No newline at end of file +CMD ["python", "/code/app.py"] diff --git a/app.py b/app.py index a4f1e21..c0555db 100644 --- a/app.py +++ b/app.py @@ -183,7 +183,7 @@ def load_user(username): @app.route('/') def index(): - return 'login
read' + return 'login
read' @app.route('/article') diff --git a/requirements.txt b/requirements.txt index 99eb928..3cb4397 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ Flask_Login==0.6.2 -Flask==2.2.2 +Flask==2.3.2 gevent==22.10.2 qrcode==6.1 Flask_RESTful==0.3.9 beautifulsoup4==4.9.1 lxml==4.9.1 Pillow==9.3.0 -requests==2.22.0 +requests==2.31.0 diff --git a/templates/base.html b/templates/base.html index c3ef138..a2c4df8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,8 +5,8 @@ {% block title %}{% endblock %} - - + + {% block body %}{% endblock %}