mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 14:17:19 +00:00
Compare commits
39 Commits
5b15aa0de8
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f788e98bb | ||
|
|
40bd6f7e7f | ||
|
|
d46517745e | ||
|
|
a7206bb7f8 | ||
|
|
df0caf709e | ||
|
|
7049f3fa3b | ||
|
|
a540cb7efd | ||
|
|
7531e5b1fc | ||
|
|
8e5654db11 | ||
|
|
4e45374365 | ||
|
|
c303bca9d5 | ||
|
|
4d20e6042a | ||
|
|
3a3fd3c560 | ||
|
|
53e75ae660 | ||
|
|
c3f2cb94aa | ||
|
|
dad9c78344 | ||
|
|
9e361381ba | ||
|
|
be293bf90f | ||
|
|
bfa768405b | ||
|
|
95f3900089 | ||
|
|
cd5ac1ce56 | ||
|
|
d71a4e6f8d | ||
|
|
b39342f751 | ||
|
|
c115d0bb82 | ||
|
|
55093e9a28 | ||
|
|
8a69766d5d | ||
|
|
c3671944d2 | ||
|
|
5788f7d7e0 | ||
|
|
7c7c3623d4 | ||
|
|
33bf7eca90 | ||
|
|
899d021c63 | ||
|
|
9dac8304ec | ||
|
|
dda5bf31b2 | ||
|
|
3d8dac206e | ||
|
|
26cd40b47c | ||
|
|
4f79d58442 | ||
|
|
6155919514 | ||
|
|
fdc577d33e | ||
|
|
c092b0c9b2 |
@@ -2,15 +2,35 @@ name: Build and push image
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [master]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Install Docker
|
||||||
run: git pull
|
run: curl -fsSL https://get.docker.com | sh
|
||||||
|
- name: Set up QEMU
|
||||||
- name: Build
|
uses: docker/setup-qemu-action@v2
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v2
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
- name: install pip
|
||||||
|
run: apt update && apt install -y python3-pip
|
||||||
|
- uses: abatilo/actions-poetry@v2
|
||||||
|
with:
|
||||||
|
poetry-version: "1.6.1"
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
# Extract version from Poetry
|
||||||
|
- name: Get version
|
||||||
|
run: echo "POETRY_VERSION=$(poetry version --short)" >> $GITHUB_ENV
|
||||||
|
- name: Build and push Docker image
|
||||||
run: |
|
run: |
|
||||||
docker build . --no-cache -t ajurna/cbwebreader
|
docker build -t ajurna/cbwebreader:latest -t ajurna/cbwebreader:${{ env.POETRY_VERSION }} .
|
||||||
|
docker push ajurna/cbwebreader:${{ env.POETRY_VERSION }}
|
||||||
|
docker push ajurna/cbwebreader:latest
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ repos:
|
|||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
- id: check-added-large-files
|
- id: check-added-large-files
|
||||||
- repo: https://github.com/python-poetry/poetry
|
- repo: https://github.com/python-poetry/poetry
|
||||||
rev: '1.2.1' # add version here
|
rev: '1.6.1' # add version here
|
||||||
hooks:
|
hooks:
|
||||||
- id: poetry-check
|
- id: poetry-check
|
||||||
- id: poetry-export
|
- id: poetry-export
|
||||||
|
|||||||
@@ -15,18 +15,17 @@ WORKDIR /src
|
|||||||
|
|
||||||
COPY . /src/
|
COPY . /src/
|
||||||
|
|
||||||
|
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install -y software-properties-common \
|
&& apt install -y software-properties-common \
|
||||||
&& apt-add-repository non-free \
|
&& apt-add-repository non-free \
|
||||||
&& apt update \
|
&& apt update \
|
||||||
&& apt install -y npm cron unrar libmariadb-dev libpq-dev \
|
&& apt install -y npm cron unrar libmariadb-dev libpq-dev pkg-config \
|
||||||
&& pip install --upgrade pip \
|
&& pip install --upgrade pip \
|
||||||
&& pip install -r requirements.txt \
|
&& pip install -r requirements.txt \
|
||||||
&& cd frontend \
|
&& cd frontend \
|
||||||
&& npm install \
|
&& npm install \
|
||||||
&& npm run build \
|
&& npm run build \
|
||||||
&& apt remove -y npm software-properties-common \
|
&& apt remove -y npm software-properties-common pkg-config \
|
||||||
&& rm -r node_modules \
|
&& rm -r node_modules \
|
||||||
&& apt -y auto-remove \
|
&& apt -y auto-remove \
|
||||||
&& apt clean \
|
&& apt clean \
|
||||||
|
|||||||
3053
frontend/package-lock.json
generated
3053
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "0.1.0",
|
"version": "0.1.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "webpack-dev-server --config webpack.dev.js",
|
"serve": "webpack-dev-server --config webpack.dev.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"pdfvuer": "^2.0.1",
|
"pdfvuer": "^2.0.1",
|
||||||
"reveal.js": "^4.3.1",
|
"reveal.js": "^4.3.1",
|
||||||
"timeago.js": "^4.0.2",
|
"timeago.js": "^4.0.2",
|
||||||
"vue": "^3.2.13",
|
"vue": "^3.2.26",
|
||||||
"vue-router": "^4.0.3",
|
"vue-router": "^4.0.3",
|
||||||
"vue-toast-notification": "3.0",
|
"vue-toast-notification": "3.0",
|
||||||
"vuejs-paginate-next": "^1.0.2",
|
"vuejs-paginate-next": "^1.0.2",
|
||||||
@@ -37,12 +37,12 @@
|
|||||||
"eslint-plugin-vue": "^8.0.3",
|
"eslint-plugin-vue": "^8.0.3",
|
||||||
"jshint": "^2.13.5",
|
"jshint": "^2.13.5",
|
||||||
"mini-css-extract-plugin": "^2.6.1",
|
"mini-css-extract-plugin": "^2.6.1",
|
||||||
"terser-webpack-plugin": "^5.3.6",
|
|
||||||
"webpack-bundle-analyzer": "^4.6.1",
|
|
||||||
"webpack-cli": "^4.10.0",
|
|
||||||
"webpack-bundle-tracker": "^1.6.0",
|
|
||||||
"style-loader": "^3.3.1",
|
"style-loader": "^3.3.1",
|
||||||
"vue-loader": "^17.0.0"
|
"terser-webpack-plugin": "^5.3.6",
|
||||||
|
"vue-loader": "^17.0.0",
|
||||||
|
"webpack-bundle-analyzer": "^4.6.1",
|
||||||
|
"webpack-bundle-tracker": "^1.6.0",
|
||||||
|
"webpack-cli": "^4.10.0"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"root": true,
|
"root": true,
|
||||||
|
|||||||
1457
poetry.lock
generated
1457
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,7 @@ line_length = 119
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "cbwebreader"
|
name = "cbwebreader"
|
||||||
version = "1.1.5"
|
version = "1.1.6"
|
||||||
description = "CBR/Z Web Reader"
|
description = "CBR/Z Web Reader"
|
||||||
authors = ["ajurna <ajurna@gmail.com>"]
|
authors = ["ajurna <ajurna@gmail.com>"]
|
||||||
license = "Creative Commons Attribution-ShareAlike 4.0 International License"
|
license = "Creative Commons Attribution-ShareAlike 4.0 International License"
|
||||||
@@ -20,7 +20,7 @@ mysqlclient = "^2.0.1"
|
|||||||
psycopg2 = "^2.9.6"
|
psycopg2 = "^2.9.6"
|
||||||
rarfile = "^4.0"
|
rarfile = "^4.0"
|
||||||
django-extensions = "^3.2.1"
|
django-extensions = "^3.2.1"
|
||||||
Pillow = "^9.3.0"
|
Pillow = "^10.0.1"
|
||||||
django-imagekit = "^4.0.2"
|
django-imagekit = "^4.0.2"
|
||||||
PyMuPDF = "~1.20.2"
|
PyMuPDF = "~1.20.2"
|
||||||
django-bootstrap4 = "^23.1"
|
django-bootstrap4 = "^23.1"
|
||||||
|
|||||||
@@ -1,60 +1,49 @@
|
|||||||
asgiref==3.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
asgiref==3.7.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
autopep8==2.0.2 ; python_version >= "3.10" and python_version < "4.0"
|
autopep8==2.0.4 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
beautifulsoup4==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
|
beautifulsoup4==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
certifi==2022.12.7 ; python_version >= "3.10" and python_version < "4"
|
|
||||||
charset-normalizer==3.1.0 ; python_version >= "3.10" and python_version < "4"
|
|
||||||
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
coreapi==2.3.3 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
coreschema==0.0.4 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
dj-database-url==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
|
dj-database-url==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-appconf==1.0.5 ; python_version >= "3.10" and python_version < "4.0"
|
django-appconf==1.0.5 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-boost==2.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-boost==2.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-bootstrap4==23.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-bootstrap4==23.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-cors-headers==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-cors-headers==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-csp==3.7 ; python_version >= "3.10" and python_version < "4.0"
|
django-csp==3.7 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-extensions==3.2.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-extensions==3.2.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-filter==23.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-filter==23.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-imagekit==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-imagekit==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-permissions-policy==4.15.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-permissions-policy==4.17.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-silk==5.0.3 ; python_version >= "3.10" and python_version < "4.0"
|
django-silk==5.0.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-sri==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-sri==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-webpack-loader==1.8.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-webpack-loader==1.8.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django==4.2 ; python_version >= "3.10" and python_version < "4.0"
|
django==4.2.4 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
djangorestframework-simplejwt==5.2.2 ; python_version >= "3.10" and python_version < "4.0"
|
djangorestframework-simplejwt==5.3.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
djangorestframework==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
djangorestframework==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
drf-extensions==0.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
drf-extensions==0.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
drf-yasg==1.21.5 ; python_version >= "3.10" and python_version < "4.0"
|
drf-yasg==1.21.7 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
gprof2dot==2022.7.29 ; python_version >= "3.10" and python_version < "4.0"
|
gprof2dot==2022.7.29 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
idna==3.4 ; python_version >= "3.10" and python_version < "4"
|
|
||||||
inflection==0.5.1 ; python_version >= "3.10" and python_version < "4.0"
|
inflection==0.5.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
itypes==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
loguru==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
|
loguru==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
markupsafe==2.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
mysqlclient==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
mysqlclient==2.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
packaging==23.1 ; python_version >= "3.10" and python_version < "4.0"
|
packaging==23.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pilkit==2.0 ; python_version >= "3.10" and python_version < "4.0"
|
pilkit==2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pillow==9.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
pillow==9.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
psycopg2==2.9.6 ; python_version >= "3.10" and python_version < "4.0"
|
psycopg2==2.9.7 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pycodestyle==2.10.0 ; python_version >= "3.10" and python_version < "4.0"
|
pycodestyle==2.11.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pyjwt==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
pyjwt==2.8.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pymupdf==1.20.2 ; python_version >= "3.10" and python_version < "4.0"
|
pymupdf==1.20.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
python-dotenv==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
|
python-dotenv==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pytz==2023.3 ; python_version >= "3.10" and python_version < "4.0"
|
pytz==2023.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
|
pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
rarfile==4.0 ; python_version >= "3.10" and python_version < "4.0"
|
rarfile==4.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
requests==2.28.2 ; python_version >= "3.10" and python_version < "4"
|
setuptools==68.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
|
|
||||||
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
setuptools==67.6.1 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
|
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
soupsieve==2.4.1 ; python_version >= "3.10" and python_version < "4.0"
|
soupsieve==2.4.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
sqlparse==0.4.3 ; python_version >= "3.10" and python_version < "4.0"
|
sqlparse==0.4.4 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
|
tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
|
||||||
typing-extensions==4.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
typing-extensions==4.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
tzdata==2023.3 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
tzdata==2023.3 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
ua-parser==0.16.1 ; python_version >= "3.10" and python_version < "4.0"
|
ua-parser==0.18.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
uritemplate==4.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
uritemplate==4.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
urllib3==1.26.15 ; python_version >= "3.10" and python_version < "4"
|
|
||||||
user-agents==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
user-agents==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
|
|||||||
Reference in New Issue
Block a user