Skip to content

Commit

Permalink
fix: auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Sep 5, 2024
1 parent 873191f commit 7d46176
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-prod-runtime-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: |
curl -L https://github.com/estesp/manifest-tool/releases/download/v2.1.7/binaries-manifest-tool-2.1.7.tar.gz | tar -zxvf - manifest-tool-linux-amd64
sudo install manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
- name: Cache layers
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles-multi-stages/tiflash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ COPY --from=busybox:1.36.1 /bin/busybox /bin/busybox
ENV LD_LIBRARY_PATH /tiflash
COPY --from=builder /tiflash/output/tiflash /tiflash

ENTRYPOINT ["/tiflash/tiflash", "server"]
ENTRYPOINT ["/tiflash/tiflash", "server"]
1 change: 0 additions & 1 deletion dockerfiles/bases/tikv-base/release-6.5.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
# set timezone
ENV TZ=/etc/localtime
ENV TZDIR=/usr/share/zoneinfo

2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/ng-monitoring/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# - docker >= v20.10
#
# build steps:
# - git clone https://github.com/pingcap/ng-monitoring.git ng-monitoring
# - git clone https://github.com/pingcap/ng-monitoring.git ng-monitoring
# - rm ng-monitoring/.dockerignore # make step depended on git metadata.
# - docker build -t ng-monitoring -f Dockerfile ./ng-monitoring

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb-dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# - docker >= v20.10
#
# build steps:
# - git clone https://github.com/pingcap/tidb-dashbord.git tidb-dashbord
# - git clone https://github.com/pingcap/tidb-dashbord.git tidb-dashbord
# - rm tidb-dashbord/.dockerignore # make step depended on git metadata.
# - docker build -t tidb-dashbord -f Dockerfile ./tidb-dashbord

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# - docker >= v20.10
#
# build steps:
# - git clone https://github.com/pingcap/tidb-operator.git tidb
# - git clone https://github.com/pingcap/tidb-operator.git tidb
# - rm tidb-operator/.dockerignore # make step depended on git metadata.
# - docker build -t tidb-operator -f Dockerfile ./tidb-operator

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/tidb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# - docker >= v20.10
#
# build steps:
# - git clone https://github.com/pingcap/tidb.git tidb
# - git clone https://github.com/pingcap/tidb.git tidb
# - rm tidb/.dockerignore # make step depended on git metadata.
# - docker build -t tidb -f Dockerfile ./tidb

Expand Down
5 changes: 2 additions & 3 deletions dockerfiles/ci/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
apt-get clean && \
npm install -g yarn pnpm

# Upgrade Git tool
# Upgrade Git tool
# renovate: datasource=github-tags depName=git/git
COPY --from=bitnami/git:2.46.0 /opt/bitnami/git/bin/git /usr/bin/git

COPY --from=bitnami/git:2.46.0 /opt/bitnami/git/bin/git /usr/bin/git
4 changes: 2 additions & 2 deletions dockerfiles/ci/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ profiles:
path: /build/artifacts/0/kaniko/buildArgs
value:
# renovate: datasource=docker depName=golang
GOLANG_VERSION: 1.20.10
GOLANG_VERSION: 1.20.10
- name: go-1.19
patches:
- op: replace
Expand All @@ -72,7 +72,7 @@ profiles:
path: /build/artifacts/0/kaniko/buildArgs
value:
# renovate: datasource=docker depName=golang
GOLANG_VERSION: 1.19.12
GOLANG_VERSION: 1.19.12
---
apiVersion: skaffold/v4beta6
kind: Config
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/ee-apps/nginx-s3/example.nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ http {
#tcp_nopush on;
gzip on;
keepalive_timeout 65;

# Define the server block for the default server
server {
listen 80 ;
Expand Down Expand Up @@ -57,6 +57,6 @@ http {
proxy_intercept_errors on;
rewrite .* /$url_full break;
proxy_pass http://$bucket;
}
}
}
}
2 changes: 1 addition & 1 deletion dockerfiles/products/le6.5-linux-amd64-debug/tiem
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ COPY bin/cluster-server ./bin
COPY bin/metadb-server ./bin
COPY build_helper/docker_start_cmd.sh ./scripts
EXPOSE 4116
ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"]
ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"]
2 changes: 1 addition & 1 deletion dockerfiles/products/le6.5-linux-amd64/tiem
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ COPY bin/cluster-server ./bin
COPY bin/metadb-server ./bin
COPY build_helper/docker_start_cmd.sh ./scripts
EXPOSE 4116
ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"]
ENTRYPOINT ["/bin/bash", "/usr/local/tiem/scripts/docker_start_cmd.sh"]
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ COPY rules/*.rules.yml /tmp/
COPY datasources/*.yaml /tmp/

ENTRYPOINT ["/usr/bin/init.sh"]
CMD ["TIDB-Cluster", "/grafana-dashboard-definitions/tidb/", "false", "/etc/prometheus"]
CMD ["TIDB-Cluster", "/grafana-dashboard-definitions/tidb/", "false", "/etc/prometheus"]
6 changes: 3 additions & 3 deletions packages/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Central declarative congfigurations for artifacts delivering.
Central declarative congfigurations for artifacts delivering.
===

> We use go template format to control them.
> Ref for SemVer Constraint: https://github.com/Masterminds/semver#checking-version-constraints
## Prerequire tools

- [gomplate](https://github.com/hairyhenderson/gomplate)
> Please install the master version.
- [gomplate](https://github.com/hairyhenderson/gomplate)
> Please install the master version.
- [yq](https://github.com/mikefarah/yq)
- [jq](https://jqlang.github.io/jq/download/)

Expand Down
1 change: 0 additions & 1 deletion packages/offline-packages.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1204,4 +1204,3 @@ editions:
url: "http://fileserver.pingcap.net/download/builds/pingcap/mydumper/0042e179b74fd9cd731be4550bee4c284c212be6/centos7/mydumper-{{ .Release.os }}-{{ .Release.arch }}.tar.gz"
extract: true
extract_inner_path: "mydumper-{{ .Release.os }}-{{ .Release.arch }}/bin/mydumper"

6 changes: 3 additions & 3 deletions packages/scripts/compose-offline-packages-artifacts.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ function pre_check_artifact{{ $i }}() {
{{- range . }}
echo -n "πŸ” check tiup package: {{ .name }}@{{ .src.version }} in platform $os/$arch."
{{- if eq .src.version "latest" }}
tiup list {{ .name }} | grep -E '^v\d+\.\d+\.\d+\s+' | tail -1 | grep -E "($os/$arch|any/any)" > /dev/null && echo " βœ…" || {
tiup list {{ .name }} | grep -E '^v\d+\.\d+\.\d+\s+' | tail -1 | grep -E "($os/$arch|any/any)" > /dev/null && echo " βœ…" || {
echo " ❌"
exit 1
}
{{- else }}
tiup list {{ .name }} | grep -E '^{{ .src.version }}\s+' | grep "$os/$arch" > /dev/null && echo " βœ…" || {
tiup list {{ .name }} | grep -E '^{{ .src.version }}\s+' | grep "$os/$arch" > /dev/null && echo " βœ…" || {
echo " ❌"
exit 1
}
Expand All @@ -158,7 +158,7 @@ function pre_check_artifact{{ $i }}() {
{{- range ($components | jq `map(select(.src.type == "oci"))`) }}
# {{ .name }}
echo -n "πŸ” check file '{{ .name }}' from OCI artifact: {{ .src.url }} -> {{ .src.path }}"
check_file_in_oci_artifact {{ .src.url }} "{{ .src.path }}" && echo " βœ…" || {
check_file_in_oci_artifact {{ .src.url }} "{{ .src.path }}" && echo " βœ…" || {
echo " ❌"
exit 1
}
Expand Down

0 comments on commit 7d46176

Please sign in to comment.