Skip to content

Commit 49f578e

Browse files
authored
Merge pull request #1247 from Websoft9/update-kavita-41d8a594
Update kavita
2 parents 2bf0193 + 9c0e437 commit 49f578e

File tree

12 files changed

+25
-212
lines changed

12 files changed

+25
-212
lines changed

apps/kavita/.env

Lines changed: 10 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,12 @@
1-
W9_REPO=wordpress
2-
W9_DIST=community
3-
W9_VERSION=latest
4-
5-
W9_POWER_PASSWORD=1PrMxExC45LsCT
6-
7-
# Environments which for user settings when create application
8-
# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
9-
W9_HTTP_PORT_SET=9001
10-
# W9_HTTPS_PORT_SET=9002
11-
# W9_DB_PORT_SET=3306
12-
# W9_SSH_PORT_SET=23
13-
W9_KEY_SET="dfsjdkjf77xjxcjcj"
14-
15-
#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
16-
17-
W9_ID=kavita
18-
19-
# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
20-
# Some container (e.g teleport) need HTTPS access, then need to set this pra
21-
W9_HTTP_PORT=80
22-
W9_HTTPS_PORT=81
23-
24-
W9_LOGIN_USER=admin
25-
# use https://1password.com/zh-cn/password-generator/ to genarate 14 bit password
26-
# this password can also use password file
27-
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
28-
W9_ADMIN_PATH="/wp-login"
29-
30-
# Container name's suffix must use one of the value
31-
W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
32-
33-
# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
34-
# If have protocols, should be set it in the APP's ENV
35-
W9_URL=internet_ip:$W9_HTTP_PORT_SET
36-
# modifies W9_URL on init when it is true
37-
W9_URL_REPLACE=true
38-
1+
W9_REPO=jvmilazz0/kavita
2+
W9_DIST='community'
3+
W9_VERSION='latest'
4+
W9_HTTP_PORT_SET='9001'
5+
W9_ID='kavita'
6+
W9_HTTP_PORT=5000
7+
W9_URL='internet_ip:$W9_HTTP_PORT_SET'
398
W9_NETWORK=websoft9
409

41-
#### ----------------------------------------------------------------------------------------- ####
42-
43-
44-
# Below environment is created by apphub
45-
46-
#W9_NAME=""
47-
#W9_RCODE=""
10+
#### https://wiki.kavitareader.com/installation/docker/dockerhub/ ####
11+
TZ=Your/Timezone
12+
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true

apps/kavita/Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

apps/kavita/Notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Appname
2-
## FAQ
1+
# Kavita
2+
## Support for multiple languages

apps/kavita/README.jinja2

Lines changed: 0 additions & 26 deletions
This file was deleted.

apps/kavita/docker-compose.yml

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,28 @@
1-
# image,docs: https://hub.docker.com/_/wordpress/
1+
# image:https://github.com/Kareadita/Kavita
2+
# docs: https://wiki.kavitareader.com/installation/docker/dockerhub/
23

34
services:
45

5-
wordpress:
6+
kavita:
67
image: $W9_REPO:$W9_VERSION
78
container_name: $W9_ID
89
restart: unless-stopped
9-
#This is for access host from container
10-
# extra_hosts: ["host.docker.internal:host-gateway"]
11-
# command: |
12-
# /bin/bash -c "ping -c 3 host.docker.internal"
13-
logging:
14-
driver: "json-file"
15-
options:
16-
max-file: "5"
17-
max-size: 10m
18-
deploy:
19-
resources:
20-
limits:
21-
memory: 5g
22-
cpus: '0.7'
2310
ports:
24-
- $W9_HTTP_PORT_SET:80
11+
- $W9_HTTP_PORT_SET:5000
2512
env_file: .env
2613
volumes:
27-
- wordpress:/var/www/html
28-
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
29-
30-
mariadb:
31-
image: mariadb:10.4
32-
container_name: $W9_ID-mariadb
33-
restart: unless-stopped
34-
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
35-
volumes:
36-
- mysql_data:/var/lib/mysql
37-
environment:
38-
MYSQL_DATABASE: $W9_ID
39-
MYSQL_USER: $W9_ID
40-
MYSQL_PASSWORD: $W9_POWER_PASSWORD
41-
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
14+
- manga_data:/manga
15+
- comics_data:/comics
16+
- books_data:/books
17+
- config_data:/kavita/config
4218

4319
volumes:
44-
wordpress:
45-
mysql_data:
20+
manga_data:
21+
comics_data:
22+
books_data:
23+
config_data:
4624

4725
networks:
4826
default:
4927
name: $W9_NETWORK
50-
external: true
28+
external: true

apps/kavita/src/after_up.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/kavita/src/encrypt.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/kavita/src/filelist

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/kavita/src/get_version.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/kavita/src/nginx-proxy.conf.template

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)