Skip to content

Commit

Permalink
版本提升至v1.9.0,更新默认env文件
Browse files Browse the repository at this point in the history
  • Loading branch information
hhyo committed Sep 22, 2022
1 parent 9b4ee81 commit ef46d5e
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 10 deletions.
14 changes: 13 additions & 1 deletion .env.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# https://docs.djangoproject.com/zh-hans/4.1/ref/settings/
DEBUG="false"
DATABASE_URL="mysql://root:@127.0.0.1:3306/archery"
CACHE_URL="redis://127.0.0.1:6379/0"
ENABLE_LDAP="true"

# https://django-auth-ldap.readthedocs.io/en/latest/
ENABLE_LDAP="false"
AUTH_LDAP_ALWAYS_UPDATE_USER="true"
AUTH_LDAP_USER_ATTR_MAP="username=cn,display=displayname,email=email"

# https://docs.djangoproject.com/en/4.0/ref/settings/#csrf-trusted-origins
CSRF_TRUSTED_ORIGINS="http://127.0.0.1:9123"

# https://django-q.readthedocs.io/en/latest/configure.html#
Q_CLUISTER_WORKERS=4
Q_CLUISTER_TIMEOUT=60
Q_CLUISTER_SYNC="false"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ body:
attributes:
label: 版本
description: 请告诉我们你正在使用的Archery版本
placeholder: 1.8.5
placeholder: 1.9.0
validations:
required: true
- type: dropdown
Expand Down
4 changes: 2 additions & 2 deletions archery/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@
# Django-Q
Q_CLUSTER = {
"name": "archery",
"workers": 4,
"workers": env("Q_CLUISTER_WORKERS", default=4),
"recycle": 500,
"timeout": 60,
"timeout": env("Q_CLUISTER_TIMEOUT", default=60),
"compress": True,
"cpu_affinity": 1,
"save_limit": 0,
Expand Down
2 changes: 1 addition & 1 deletion src/charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 1

image:
repository: hhyo/archery
tag: v1.8.5
tag: v1.9.0
pullPolicy: IfNotPresent

nameOverride: ""
Expand Down
20 changes: 20 additions & 0 deletions src/docker-compose/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
NGINX_PORT=9123

# https://docs.djangoproject.com/zh-hans/4.1/ref/settings/
DEBUG="false"
NIDATABASE_URL="mysql://root:123456@mysql:3306/archery"
CACHE_URL="redis://redis:6379/0?PASSWORD=123456"

# https://docs.djangoproject.com/en/4.0/ref/settings/#csrf-trusted-origins
CSRF_TRUSTED_ORIGINS="http://127.0.0.1:9123"

# https://django-auth-ldap.readthedocs.io/en/latest/
ENABLE_LDAP="false"
AUTH_LDAP_ALWAYS_UPDATE_USER="true"
AUTH_LDAP_USER_ATTR_MAP="username=cn,display=displayname,email=email"

# https://django-q.readthedocs.io/en/latest/configure.html#
Q_CLUISTER_WORKERS=4
Q_CLUISTER_TIMEOUT=60
Q_CLUISTER_SYNC="false"

8 changes: 3 additions & 5 deletions src/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- "./inception/config.toml:/etc/config.toml"

archery:
image: hhyo/archery:v1.8.5
image: hhyo/archery:v1.9.0
container_name: archery
restart: always
ports:
Expand All @@ -46,7 +46,5 @@ services:
- "./archery/logs:/opt/archery/logs"
- "./archery/keys:/opt/archery/keys"
entrypoint: "dockerize -wait tcp://mysql:3306 -wait tcp://redis:6379 -timeout 60s /opt/archery/src/docker/startup.sh"
environment:
NGINX_PORT: 9123
DATABASE_URL: "mysql://root:123456@mysql:3306/archery"
CACHE_URL: "redis://redis:6379/0?PASSWORD=123456"
env_file:
- .env

0 comments on commit ef46d5e

Please sign in to comment.