Skip to content

Commit

Permalink
refactor(dockerfile): update dockerfile for release 6.5
Browse files Browse the repository at this point in the history
From for ~6.5.12 we switch the base image to the new one.

Signed-off-by: wuhuizuo <[email protected]>
  • Loading branch information
wuhuizuo committed Oct 21, 2024
1 parent 26105b4 commit 1bdabe3
Show file tree
Hide file tree
Showing 48 changed files with 83 additions and 67 deletions.
15 changes: 0 additions & 15 deletions dockerfiles/products/le6.5-linux-amd64-debug/tiem

This file was deleted.

15 changes: 0 additions & 15 deletions dockerfiles/products/le6.5-linux-amd64/tiem

This file was deleted.

11 changes: 0 additions & 11 deletions dockerfiles/products/le6.5-linux-arm64/dm-monitor-initializer

This file was deleted.

7 changes: 0 additions & 7 deletions dockerfiles/products/le6.5-linux-arm64/tidb-operator

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.0.1-old
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.2
FROM $BASE_IMG
COPY ng-monitoring-server /ng-monitoring-server
EXPOSE 12020
Expand Down
5 changes: 5 additions & 0 deletions dockerfiles/products/ng-monitoring/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/ng-monitoring-base:v1.9.2
FROM $BASE_IMG
COPY ng-monitoring-server /ng-monitoring-server
EXPOSE 12020
ENTRYPOINT ["/ng-monitoring-server"]
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions dockerfiles/products/pd/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.2
FROM $BASE_IMG
COPY pd-server /pd-server
COPY pd-ctl /pd-ctl
COPY pd-recover /pd-recover
EXPOSE 2379 2380
ENTRYPOINT ["/pd-server"]
File renamed without changes.
9 changes: 9 additions & 0 deletions dockerfiles/products/tidb-binlog/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG
COPY pump /pump
COPY drainer /drainer
COPY reparo /reparo
COPY binlogctl /binlogctl
EXPOSE 4000
EXPOSE 8249 8250
CMD ["/pump"]
5 changes: 5 additions & 0 deletions dockerfiles/products/tidb-dashboard/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/pd-base:v1.9.2
FROM $BASE_IMG
COPY tidb-dashboard /tidb-dashboard
EXPOSE 12333
ENTRYPOINT ["/tidb-dashboard"]
File renamed without changes.
3 changes: 3 additions & 0 deletions dockerfiles/products/tidb-tools/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG
COPY sync_diff_inspector /sync_diff_inspector
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions dockerfiles/products/tidb/~6.5.12/br.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG

COPY br /br
4 changes: 4 additions & 0 deletions dockerfiles/products/tidb/~6.5.12/dumpling.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG

COPY dumpling /dumpling
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG

COPY tidb-lightning /tidb-lightning
COPY tidb-lightning-ctl /tidb-lightning-ctl
COPY br /br
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.8.0-release-6.5
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.0.1-old
FROM $BASE_IMG
COPY tidb-server /tidb-server
EXPOSE 4000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.8.0-release-6.5
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tidb-base:v1.9.2
FROM $BASE_IMG
COPY tidb-server /tidb-server
COPY audit-1.so /plugins/audit-1.so
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions dockerfiles/products/tiflash/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.2
FROM $BASE_IMG
ENV LD_LIBRARY_PATH /tiflash
COPY tiflash /tiflash
ENTRYPOINT ["/tiflash/tiflash", "server"]
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions dockerfiles/products/tiflow/~6.5.12/dm.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG

COPY dm-worker /dm-worker
COPY dm-master /dm-master
COPY dmctl /dmctl

EXPOSE 8291 8261 8262
7 changes: 7 additions & 0 deletions dockerfiles/products/tiflow/~6.5.12/ticdc.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tools-base:v1.9.2
FROM $BASE_IMG

COPY cdc /cdc

EXPOSE 8300
CMD [ "/cdc" ]
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions dockerfiles/products/tikv/~6.5.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG BASE_IMG=ghcr.io/pingcap-qe/bases/tikv-base:v1.0.0-old
FROM $BASE_IMG
COPY tikv-server /tikv-server
COPY tikv-ctl /tikv-ctl
EXPOSE 20160
ENTRYPOINT ["/tikv-server"]
32 changes: 16 additions & 16 deletions packages/packages.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ components:
type: image
artifactory:
repo: "{{ .Release.registry }}/pingcap/ng-monitoring/image"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring/lt6.5.12/Dockerfile
files:
- name: ng-monitoring-server
src:
Expand Down Expand Up @@ -532,7 +532,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/lt6.5.12/Dockerfile
{{- end }}
files: # prepare for context
- name: pd-server
Expand Down Expand Up @@ -711,7 +711,7 @@ components:
type: image
artifactory:
repo: "{{ .Release.registry }}/tikv/pd/image"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/pd/lt6.5.12/Dockerfile
files: # prepare for context
- { name: pd-server, src: { path: bin/pd-server } }
- { name: pd-ctl, src: { path: bin/pd-ctl } }
Expand Down Expand Up @@ -1135,7 +1135,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/lt6.5.12/tidb.Dockerfile
{{- end }}
files: # prepare for context
- name: tidb-server
Expand All @@ -1149,7 +1149,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-enterprise.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb.enterprise.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/lt6.5.12/tidb.enterprise.Dockerfile
{{- end }}
files: # prepare for context
- name: tidb-server
Expand All @@ -1168,7 +1168,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/br.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/br.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/lt6.5.12/br.Dockerfile
{{- end }}
files: # prepare for context
- name: br
Expand All @@ -1181,7 +1181,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/dumpling.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/dumpling.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/lt6.5.12/dumpling.Dockerfile
{{- end }}
files: # prepare for context
- name: dumpling
Expand All @@ -1194,7 +1194,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-lightning.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/le6.5/tidb-lightning.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/lt6.5.12/tidb-lightning.Dockerfile
{{- end }}
files: # prepare for context
- name: tidb-lightning
Expand Down Expand Up @@ -1251,7 +1251,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-tools/lt6.5.12/Dockerfile
{{- end }}
files:
- name: sync_diff_inspector
Expand Down Expand Up @@ -1373,7 +1373,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-binlog/lt6.5.12/Dockerfile
{{- end }}
files: # context files
- name: pump
Expand Down Expand Up @@ -1598,7 +1598,7 @@ components:
type: image
artifactory:
repo: "{{ .Release.registry }}/pingcap/tidb-dashboard/image"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb-dashboard/lt6.5.12/Dockerfile
files: # prepare for context
- name: tidb-dashboard
src:
Expand Down Expand Up @@ -1694,7 +1694,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/lt6.5.12/Dockerfile
{{- end }}
files:
- name: tiflash/
Expand Down Expand Up @@ -1795,7 +1795,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/lt6.5.12/Dockerfile
{{- end }}
files:
- name: tiflash/
Expand Down Expand Up @@ -2075,7 +2075,7 @@ components:
type: image
artifactory:
repo: "{{ .Release.registry }}/pingcap/tiflow/images/cdc"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/le6.5/ticdc.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/lt6.5.12/ticdc.Dockerfile
files: # context files
- name: cdc
src:
Expand All @@ -2084,7 +2084,7 @@ components:
type: image
artifactory:
repo: "{{ .Release.registry }}/pingcap/tiflow/images/dm"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/le6.5/dm.Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflow/lt6.5.12/dm.Dockerfile
files:
- name: dm-master
src:
Expand Down Expand Up @@ -2283,7 +2283,7 @@ components:
{{- if semver.CheckConstraint ">= 6.6.0-0" .Release.version }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv.Dockerfile
{{- else }}
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/le6.5/Dockerfile
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tikv/lt6.5.12/Dockerfile
{{- end }}
files: # prepare for context
- { name: tikv-server, src: { path: bin/tikv-server } }
Expand Down

0 comments on commit 1bdabe3

Please sign in to comment.