Fixed style of files

This commit is contained in:
Alexey Pustovalov 2024-02-14 20:51:57 +09:00 committed by Alexey Pustovalov
parent b17b4d3ae2
commit cad6d1eb7c
26 changed files with 95 additions and 81 deletions

View File

@ -1,20 +1,41 @@
- repo: https://github.com/gitleaks/gitleaks repos:
rev: v8.16.3 - repo: https://github.com/gitleaks/gitleaks
hooks: rev: v8.16.3
- id: gitleaks hooks:
- repo: https://github.com/jumanjihouse/pre-commit-hooks - id: gitleaks
rev: 3.0.0 - repo: https://github.com/jumanjihouse/pre-commit-hooks
hooks: rev: 3.0.0
- id: shellcheck hooks:
- repo: https://github.com/pre-commit/pre-commit-hooks - id: shellcheck
rev: v4.5.0 - repo: https://github.com/pre-commit/pre-commit-hooks
hooks: rev: v4.5.0
- id: end-of-file-fixer hooks:
- id: trailing-whitespace - id: end-of-file-fixer
- id: check-yaml exclude: |
- id: check-symlinks (?x)(
- id: pretty-format-json ^env_vars/\.MYSQL |
- repo: https://github.com/asottile/setup-cfg-fmt ^env_vars/\.POSTGRES
rev: v2.5.0 )
hooks: - repo: https://github.com/pre-commit/pre-commit-hooks
- id: setup-cfg-fmt rev: v4.5.0
hooks:
- id: trailing-whitespace
exclude: |
(?x)(
.*\.patch$
)
- id: check-yaml
args: [--allow-multiple-documents]
- id: check-symlinks
# - id: pretty-format-json
- id: check-added-large-files
#- repo: https://github.com/adrienverge/yamllint.git
# rev: v1.21.0 # or higher tag
# hooks:
# - id: yamllint
# args: [--format, parsable, --strict]
#- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
# rev: 0.2.3
# hooks:
# - id: yamlfmt
# args: [--mapping, '2', --sequence, '1', --offset, '0', --colons, --width, '400']

View File

@ -5,4 +5,3 @@ gpgcheck=1
enabled=0 enabled=0
gpgkey=https://nginx.org/keys/nginx_signing.key gpgkey=https://nginx.org/keys/nginx_signing.key
module_hotfixes=true module_hotfixes=true

View File

@ -8,43 +8,43 @@
"linux/s390x", "linux/s390x",
"linux/ppc64le" "linux/ppc64le"
], ],
"centos": [
"linux/amd64",
"linux/arm64",
"linux/ppc64le"
],
"ol": [ "ol": [
"linux/amd64", "linux/amd64",
"linux/arm64" "linux/arm64"
], ],
"rhel": [
"X64",
"ARM64"
],
"ubuntu": [ "ubuntu": [
"linux/amd64", "linux/amd64",
"linux/arm/v7", "linux/arm/v7",
"linux/arm64", "linux/arm64",
"linux/s390x" "linux/s390x"
],
"centos": [
"linux/amd64",
"linux/arm64",
"linux/ppc64le"
],
"rhel": [
"X64",
"ARM64"
] ]
}, },
"os-windows": { "os-windows": {
"windows-2022": "ltsc2022", "windows-2019": "ltsc2019",
"windows-2019": "ltsc2019" "windows-2022": "ltsc2022"
}, },
"components": { "components": {
"agent": { "base" : "build-mysql", "rhel" : true }, "agent": { "base": "build-mysql", "rhel": true },
"agent2": { "base" : "build-mysql", "rhel" : true }, "agent2": { "base": "build-mysql", "rhel": true },
"java-gateway": { "base" : "build-mysql", "rhel" : true }, "java-gateway": { "base": "build-mysql", "rhel": true },
"proxy-mysql": { "base" : "build-mysql", "rhel" : true }, "proxy-mysql": { "base": "build-mysql", "rhel": true },
"proxy-sqlite3": { "base" : "build-sqlite3", "rhel" : true }, "proxy-sqlite3": { "base": "build-sqlite3", "rhel": true },
"server-mysql": { "base" : "build-mysql", "rhel" : true }, "server-mysql": { "base": "build-mysql", "rhel": true },
"server-pgsql": { "base" : "build-pgsql", "rhel" : false }, "server-pgsql": { "base": "build-pgsql", "rhel": false },
"snmptraps": { "base" : "", "rhel" : true }, "snmptraps": { "base": "", "rhel": true },
"web-apache-mysql": { "base" : "build-mysql", "rhel" : false }, "web-apache-mysql": { "base": "build-mysql", "rhel": false },
"web-apache-pgsql": { "base" : "build-pgsql", "rhel" : false }, "web-apache-pgsql": { "base": "build-pgsql", "rhel": false },
"web-nginx-mysql": { "base" : "build-mysql", "rhel" : true }, "web-nginx-mysql": { "base": "build-mysql", "rhel": true },
"web-nginx-pgsql": { "base" : "build-mysql", "rhel" : false }, "web-nginx-pgsql": { "base": "build-mysql", "rhel": false },
"web-service": { "base" : "build-mysql", "rhel" : true } "web-service": { "base": "build-mysql", "rhel": true }
} }
} }

View File

@ -603,12 +603,6 @@ spec:
periodSeconds: 5 periodSeconds: 5
timeoutSeconds: 3 timeoutSeconds: 3
failureThreshold: 40 failureThreshold: 40
livenessProbe:
tcpSocket:
port: 10051
timeoutSeconds: 3
failureThreshold: 3
periodSeconds: 10
securityContext: securityContext:
capabilities: {} capabilities: {}
privileged: false privileged: false