Skip to content

Commit 60c0b06

Browse files
lunnylunny
authored
Merge branch 'main' into improve-action-fe
2 parents 14655d8 + a8e13e6 commit 60c0b06

File tree

98 files changed

+1625
-630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1625
-630
lines changed

‎.drone.yml

+83-18
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ steps:
12061206
- git fetch --tags --force
12071207

12081208
- name: publish
1209-
image: techknowlogick/drone-docker:latest
1209+
image: plugins/docker:latest
12101210
pull: always
12111211
settings:
12121212
auto_tag: true
@@ -1218,13 +1218,17 @@ steps:
12181218
from_secret: docker_password
12191219
username:
12201220
from_secret: docker_username
1221+
environment:
1222+
PLUGIN_MIRROR:
1223+
from_secret: plugin_mirror
1224+
DOCKER_BUILDKIT: 1
12211225
when:
12221226
event:
12231227
exclude:
12241228
- pull_request
12251229

12261230
- name: publish-rootless
1227-
image: techknowlogick/drone-docker:latest
1231+
image: plugins/docker:latest
12281232
settings:
12291233
dockerfile: Dockerfile.rootless
12301234
auto_tag: true
@@ -1236,6 +1240,10 @@ steps:
12361240
from_secret: docker_password
12371241
username:
12381242
from_secret: docker_username
1243+
environment:
1244+
PLUGIN_MIRROR:
1245+
from_secret: plugin_mirror
1246+
DOCKER_BUILDKIT: 1
12391247
when:
12401248
event:
12411249
exclude:
@@ -1276,7 +1284,7 @@ steps:
12761284
- git fetch --tags --force
12771285

12781286
- name: publish
1279-
image: techknowlogick/drone-docker:latest
1287+
image: plugins/docker:latest
12801288
pull: always
12811289
settings:
12821290
tags: ${DRONE_TAG##v}-linux-amd64
@@ -1287,13 +1295,17 @@ steps:
12871295
from_secret: docker_password
12881296
username:
12891297
from_secret: docker_username
1298+
environment:
1299+
PLUGIN_MIRROR:
1300+
from_secret: plugin_mirror
1301+
DOCKER_BUILDKIT: 1
12901302
when:
12911303
event:
12921304
exclude:
12931305
- pull_request
12941306

12951307
- name: publish-rootless
1296-
image: techknowlogick/drone-docker:latest
1308+
image: plugins/docker:latest
12971309
settings:
12981310
dockerfile: Dockerfile.rootless
12991311
tags: ${DRONE_TAG##v}-linux-amd64-rootless
@@ -1304,6 +1316,10 @@ steps:
13041316
from_secret: docker_password
13051317
username:
13061318
from_secret: docker_username
1319+
environment:
1320+
PLUGIN_MIRROR:
1321+
from_secret: plugin_mirror
1322+
DOCKER_BUILDKIT: 1
13071323
when:
13081324
event:
13091325
exclude:
@@ -1341,7 +1357,7 @@ steps:
13411357
- git fetch --tags --force
13421358

13431359
- name: publish
1344-
image: techknowlogick/drone-docker:latest
1360+
image: plugins/docker:latest
13451361
pull: always
13461362
settings:
13471363
auto_tag: false
@@ -1353,13 +1369,17 @@ steps:
13531369
from_secret: docker_password
13541370
username:
13551371
from_secret: docker_username
1372+
environment:
1373+
PLUGIN_MIRROR:
1374+
from_secret: plugin_mirror
1375+
DOCKER_BUILDKIT: 1
13561376
when:
13571377
event:
13581378
exclude:
13591379
- pull_request
13601380

13611381
- name: publish-rootless
1362-
image: techknowlogick/drone-docker:latest
1382+
image: plugins/docker:latest
13631383
settings:
13641384
dockerfile: Dockerfile.rootless
13651385
auto_tag: false
@@ -1371,6 +1391,10 @@ steps:
13711391
from_secret: docker_password
13721392
username:
13731393
from_secret: docker_username
1394+
environment:
1395+
PLUGIN_MIRROR:
1396+
from_secret: plugin_mirror
1397+
DOCKER_BUILDKIT: 1
13741398
when:
13751399
event:
13761400
exclude:
@@ -1407,7 +1431,7 @@ steps:
14071431
- git fetch --tags --force
14081432

14091433
- name: publish
1410-
image: techknowlogick/drone-docker:latest
1434+
image: plugins/docker:latest
14111435
pull: always
14121436
settings:
14131437
auto_tag: false
@@ -1419,13 +1443,17 @@ steps:
14191443
from_secret: docker_password
14201444
username:
14211445
from_secret: docker_username
1446+
environment:
1447+
PLUGIN_MIRROR:
1448+
from_secret: plugin_mirror
1449+
DOCKER_BUILDKIT: 1
14221450
when:
14231451
event:
14241452
exclude:
14251453
- pull_request
14261454

14271455
- name: publish-rootless
1428-
image: techknowlogick/drone-docker:latest
1456+
image: plugins/docker:latest
14291457
settings:
14301458
dockerfile: Dockerfile.rootless
14311459
auto_tag: false
@@ -1437,6 +1465,10 @@ steps:
14371465
from_secret: docker_password
14381466
username:
14391467
from_secret: docker_username
1468+
environment:
1469+
PLUGIN_MIRROR:
1470+
from_secret: plugin_mirror
1471+
DOCKER_BUILDKIT: 1
14401472
when:
14411473
event:
14421474
exclude:
@@ -1445,7 +1477,7 @@ steps:
14451477
---
14461478
kind: pipeline
14471479
type: docker
1448-
name: docker-linux-arm64-dry-run
1480+
name: docker-linux-amd64-dry-run
14491481

14501482
platform:
14511483
os: linux
@@ -1463,7 +1495,7 @@ trigger:
14631495

14641496
steps:
14651497
- name: dryrun
1466-
image: techknowlogick/drone-docker:latest
1498+
image: plugins/docker:latest
14671499
pull: always
14681500
settings:
14691501
dry_run: true
@@ -1474,6 +1506,7 @@ steps:
14741506
environment:
14751507
PLUGIN_MIRROR:
14761508
from_secret: plugin_mirror
1509+
DOCKER_BUILDKIT: 1
14771510
when:
14781511
event:
14791512
- pull_request
@@ -1516,7 +1549,7 @@ steps:
15161549
- git fetch --tags --force
15171550

15181551
- name: publish
1519-
image: techknowlogick/drone-docker:latest
1552+
image: plugins/docker:latest
15201553
pull: always
15211554
settings:
15221555
auto_tag: true
@@ -1528,13 +1561,17 @@ steps:
15281561
from_secret: docker_password
15291562
username:
15301563
from_secret: docker_username
1564+
environment:
1565+
PLUGIN_MIRROR:
1566+
from_secret: plugin_mirror
1567+
DOCKER_BUILDKIT: 1
15311568
when:
15321569
event:
15331570
exclude:
15341571
- pull_request
15351572

15361573
- name: publish-rootless
1537-
image: techknowlogick/drone-docker:latest
1574+
image: plugins/docker:latest
15381575
settings:
15391576
dockerfile: Dockerfile.rootless
15401577
auto_tag: true
@@ -1546,6 +1583,10 @@ steps:
15461583
from_secret: docker_password
15471584
username:
15481585
from_secret: docker_username
1586+
environment:
1587+
PLUGIN_MIRROR:
1588+
from_secret: plugin_mirror
1589+
DOCKER_BUILDKIT: 1
15491590
when:
15501591
event:
15511592
exclude:
@@ -1586,7 +1627,7 @@ steps:
15861627
- git fetch --tags --force
15871628

15881629
- name: publish
1589-
image: techknowlogick/drone-docker:latest
1630+
image: plugins/docker:latest
15901631
pull: always
15911632
settings:
15921633
tags: ${DRONE_TAG##v}-linux-arm64
@@ -1597,13 +1638,17 @@ steps:
15971638
from_secret: docker_password
15981639
username:
15991640
from_secret: docker_username
1641+
environment:
1642+
PLUGIN_MIRROR:
1643+
from_secret: plugin_mirror
1644+
DOCKER_BUILDKIT: 1
16001645
when:
16011646
event:
16021647
exclude:
16031648
- pull_request
16041649

16051650
- name: publish-rootless
1606-
image: techknowlogick/drone-docker:latest
1651+
image: plugins/docker:latest
16071652
settings:
16081653
dockerfile: Dockerfile.rootless
16091654
tags: ${DRONE_TAG##v}-linux-arm64-rootless
@@ -1614,6 +1659,10 @@ steps:
16141659
from_secret: docker_password
16151660
username:
16161661
from_secret: docker_username
1662+
environment:
1663+
PLUGIN_MIRROR:
1664+
from_secret: plugin_mirror
1665+
DOCKER_BUILDKIT: 1
16171666
when:
16181667
event:
16191668
exclude:
@@ -1654,7 +1703,7 @@ steps:
16541703
- git fetch --tags --force
16551704

16561705
- name: publish
1657-
image: techknowlogick/drone-docker:latest
1706+
image: plugins/docker:latest
16581707
pull: always
16591708
settings:
16601709
auto_tag: false
@@ -1666,13 +1715,17 @@ steps:
16661715
from_secret: docker_password
16671716
username:
16681717
from_secret: docker_username
1718+
environment:
1719+
PLUGIN_MIRROR:
1720+
from_secret: plugin_mirror
1721+
DOCKER_BUILDKIT: 1
16691722
when:
16701723
event:
16711724
exclude:
16721725
- pull_request
16731726

16741727
- name: publish-rootless
1675-
image: techknowlogick/drone-docker:latest
1728+
image: plugins/docker:latest
16761729
settings:
16771730
dockerfile: Dockerfile.rootless
16781731
auto_tag: false
@@ -1684,6 +1737,10 @@ steps:
16841737
from_secret: docker_password
16851738
username:
16861739
from_secret: docker_username
1740+
environment:
1741+
PLUGIN_MIRROR:
1742+
from_secret: plugin_mirror
1743+
DOCKER_BUILDKIT: 1
16871744
when:
16881745
event:
16891746
exclude:
@@ -1720,7 +1777,7 @@ steps:
17201777
- git fetch --tags --force
17211778

17221779
- name: publish
1723-
image: techknowlogick/drone-docker:latest
1780+
image: plugins/docker:latest
17241781
pull: always
17251782
settings:
17261783
auto_tag: false
@@ -1732,13 +1789,17 @@ steps:
17321789
from_secret: docker_password
17331790
username:
17341791
from_secret: docker_username
1792+
environment:
1793+
PLUGIN_MIRROR:
1794+
from_secret: plugin_mirror
1795+
DOCKER_BUILDKIT: 1
17351796
when:
17361797
event:
17371798
exclude:
17381799
- pull_request
17391800

17401801
- name: publish-rootless
1741-
image: techknowlogick/drone-docker:latest
1802+
image: plugins/docker:latest
17421803
settings:
17431804
dockerfile: Dockerfile.rootless
17441805
auto_tag: false
@@ -1750,6 +1811,10 @@ steps:
17501811
from_secret: docker_password
17511812
username:
17521813
from_secret: docker_username
1814+
environment:
1815+
PLUGIN_MIRROR:
1816+
from_secret: plugin_mirror
1817+
DOCKER_BUILDKIT: 1
17531818
when:
17541819
event:
17551820
exclude:

‎custom/conf/app.example.ini

+16
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,22 @@ ROUTER = console
576576
;; The routing level will default to that of the system but individual router level can be set in
577577
;; [log.<mode>.router] LEVEL
578578
;;
579+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
580+
;;
581+
;; Print request id which parsed from request headers in access log, when access log is enabled.
582+
;; * E.g:
583+
;; * In request Header: X-Request-ID: test-id-123
584+
;; * Configuration in app.ini: REQUEST_ID_HEADERS = X-Request-ID
585+
;; * Print in log: 127.0.0.1:58384 - - [14/Feb/2023:16:33:51 +0800] "test-id-123"
586+
;;
587+
;; If you configure more than one in the .ini file, it will match in the order of configuration,
588+
;; and the first match will be finally printed in the log.
589+
;; * E.g:
590+
;; * In reuqest Header: X-Trace-ID: trace-id-1q2w3e4r
591+
;; * Configuration in app.ini: REQUEST_ID_HEADERS = X-Request-ID, X-Trace-ID, X-Req-ID
592+
;; * Print in log: 127.0.0.1:58384 - - [14/Feb/2023:16:33:51 +0800] "trace-id-1q2w3e4r"
593+
;;
594+
;; REQUEST_ID_HEADERS =
579595

580596
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
581597
;;

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

+6
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,13 @@ Default templates for project boards:
881881
- `Identity`: the SignedUserName or `"-"` if not logged in.
882882
- `Start`: the start time of the request.
883883
- `ResponseWriter`: the responseWriter from the request.
884+
- `RequestID`: the value matching REQUEST_ID_HEADERS（default: `-`, if not matched）.
884885
- You must be very careful to ensure that this template does not throw errors or panics as this template runs outside of the panic/recovery script.
886+
- `REQUEST_ID_HEADERS`: **\<empty\>**: You can configure multiple values that are splited by comma here. It will match in the order of configuration, and the first match will be finally printed in the access log.
887+
- e.g.
888+
- In the Request Header: X-Request-ID: **test-id-123**
889+
- Configuration in app.ini: REQUEST_ID_HEADERS = X-Request-ID
890+
- Print in log: 127.0.0.1:58384 - - [14/Feb/2023:16:33:51 +0800] "**test-id-123**" ...
885891

886892
### Log subsections (`log.name`, `log.name.*`)
887893

‎docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,22 @@ test01.xls: application/vnd.ms-excel; charset=binary
262262

263263
- `ROOT_PATH`: 日志文件根目录。
264264
- `MODE`: 日志记录模式，默认是为 `console`。如果要写到多个通道，用逗号分隔
265-
- `LEVEL`: 日志级别，默认为`Trace`。
265+
- `LEVEL`: 日志级别，默认为 `Trace`。
266+
- `DISABLE_ROUTER_LOG`: 关闭日志中的路由日志。
267+
- `ENABLE_ACCESS_LOG`: 是否开启 Access Log, 默认为 false。
268+
- `ACCESS_LOG_TEMPLATE`: `access.log` 输出内容的模板，默认模板：**`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**
269+
模板支持以下参数:
270+
- `Ctx`: 请求上下文。
271+
- `Identity`: 登录用户名，默认: “`-`”。
272+
- `Start`: 请求开始时间。
273+
- `ResponseWriter`:
274+
- `RequestID`: 从请求头中解析得到的与 `REQUEST_ID_HEADERS` 匹配的值，默认: “`-`”。
275+
- 一定要谨慎配置该模板，否则可能会引起panic.
276+
- `REQUEST_ID_HEADERS`: 从 Request Header 中匹配指定 Key，并将匹配到的值输出到 `access.log` 中(需要在 `ACCESS_LOG_TEMPLATE` 中指定输出位置)。如果在该参数中配置多个 Key， 请用逗号分割，程序将按照配置的顺序进行匹配。
277+
- 示例：
278+
- 请求头： X-Request-ID: **test-id-123**
279+
- 配置文件： REQUEST_ID_HEADERS = X-Request-ID
280+
- 日志输出： 127.0.0.1:58384 - - [14/Feb/2023:16:33:51 +0800] "**test-id-123**" ...
266281

267282
## Cron (`cron`)
268283

0 commit comments

Comments
 (0)