From 78e8b81cd9046924b649fe34996ff99545e03007 Mon Sep 17 00:00:00 2001 From: fuwenkai <834260992@qq.com> Date: Wed, 24 Jul 2024 11:36:41 +0800 Subject: [PATCH 1/4] [INLONG-10662][Release] Change the tag of Docker images to 1.13.0 --- conf/inlong.conf | 2 +- docker/docker-compose/.env | 2 +- docker/kubernetes/README.md | 2 +- docker/kubernetes/values.yaml | 18 +++++++++--------- inlong-agent/agent-docker/README.md | 2 +- inlong-audit/audit-docker/README.md | 2 +- inlong-dataproxy/dataproxy-docker/README.md | 2 +- inlong-manager/manager-docker/README.md | 2 +- .../tubemq-docker/tubemq-all/README.md | 2 +- .../tubemq-docker/tubemq-manager/README.md | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/inlong.conf b/conf/inlong.conf index df0deb74fab..65ed885e95d 100644 --- a/conf/inlong.conf +++ b/conf/inlong.conf @@ -27,7 +27,7 @@ spring_datasource_password=inlong ############## Dashboard Configuration ############## # dashboard docker image -dashboard_docker_image=inlong/dashboard:latest +dashboard_docker_image=inlong/dashboard:1.13.0 # dashboard service port dashboard_mapping_port=80 diff --git a/docker/docker-compose/.env b/docker/docker-compose/.env index dce60412ce7..486dfb7a1a2 100644 --- a/docker/docker-compose/.env +++ b/docker/docker-compose/.env @@ -16,4 +16,4 @@ # # you can choose the released version number, like 1.3.0 # the latest tag corresponds to the master branch -VERSION_TAG=latest +VERSION_TAG=1.13.0 diff --git a/docker/kubernetes/README.md b/docker/kubernetes/README.md index 3d946a973ce..94b4977cbef 100644 --- a/docker/kubernetes/README.md +++ b/docker/kubernetes/README.md @@ -74,7 +74,7 @@ The configuration file is [values.yaml](values.yaml), and the following tables l | `timezone` | `Asia/Shanghai` | World time and date for cities in all time zones | | `images.pullPolicy` | `IfNotPresent` | Image pull policy. One of `Always`, `Never`, `IfNotPresent` | | `images..repository` | | Docker image repository for the component | -| `images..tag` | `latest` | Docker image tag for the component | +| `images..tag` | `1.13.0` | Docker image tag for the component | | `.component` | | Component name | | `.replicas` | `1` | Replicas is the desired number of replicas of a given Template | | `.podManagementPolicy` | `OrderedReady` | PodManagementPolicy controls how pods are created during initial scale up, when replacing pods on nodes, or when scaling down | diff --git a/docker/kubernetes/values.yaml b/docker/kubernetes/values.yaml index b6e8eec58fc..ac9ebc73822 100644 --- a/docker/kubernetes/values.yaml +++ b/docker/kubernetes/values.yaml @@ -28,34 +28,34 @@ components: images: agent: repository: inlong/agent - tag: latest + tag: 1.13.0 dashboard: repository: inlong/dashboard - tag: latest + tag: 1.13.0 dataproxy: repository: inlong/dataproxy - tag: latest + tag: 1.13.0 tubemqManager: repository: inlong/tubemq-manager - tag: latest + tag: 1.13.0 tubemqServer: repository: inlong/tubemq-all - tag: latest + tag: 1.13.0 manager: repository: inlong/manager - tag: latest + tag: 1.13.0 audit: repository: inlong/audit - tag: latest + tag: 1.13.0 mysql: repository: mysql tag: 8.0.28 zookeeper: repository: zookeeper - tag: latest + tag: 1.13.0 initContainer: repository: busybox - tag: latest + tag: 1.13.0 pullPolicy: "Always" ingress: diff --git a/inlong-agent/agent-docker/README.md b/inlong-agent/agent-docker/README.md index 8ae753cb5b5..535fd469d3b 100644 --- a/inlong-agent/agent-docker/README.md +++ b/inlong-agent/agent-docker/README.md @@ -3,7 +3,7 @@ InLong Agent is available for development and experience. ##### Pull Image ``` -docker pull inlong/agent:latest +docker pull inlong/agent:1.13.0 ``` ##### Start Container diff --git a/inlong-audit/audit-docker/README.md b/inlong-audit/audit-docker/README.md index 3bd9d8818c6..8332cdd3e66 100644 --- a/inlong-audit/audit-docker/README.md +++ b/inlong-audit/audit-docker/README.md @@ -3,7 +3,7 @@ InLong Audit is available for development and experience. ##### Pull Image ``` -docker pull inlong/audit:latest +docker pull inlong/audit:1.13.0 ``` ##### Start Container diff --git a/inlong-dataproxy/dataproxy-docker/README.md b/inlong-dataproxy/dataproxy-docker/README.md index 6ae82baec35..8fbda1e2e80 100644 --- a/inlong-dataproxy/dataproxy-docker/README.md +++ b/inlong-dataproxy/dataproxy-docker/README.md @@ -3,7 +3,7 @@ InLong DataProxy is available for development and experience. ##### Pull Image ``` -docker pull inlong/dataproxy:latest +docker pull inlong/dataproxy:1.13.0 ``` ##### Start Container diff --git a/inlong-manager/manager-docker/README.md b/inlong-manager/manager-docker/README.md index af3c04201ef..d332b4cbac9 100644 --- a/inlong-manager/manager-docker/README.md +++ b/inlong-manager/manager-docker/README.md @@ -5,7 +5,7 @@ InLong Manager is available for development and experience. ### Pull Image ``` -docker pull inlong/manager:latest +docker pull inlong/manager:1.13.0 ``` ### Start Container diff --git a/inlong-tubemq/tubemq-docker/tubemq-all/README.md b/inlong-tubemq/tubemq-docker/tubemq-all/README.md index 9d5e4591176..ad9ae8b074e 100644 --- a/inlong-tubemq/tubemq-docker/tubemq-all/README.md +++ b/inlong-tubemq/tubemq-docker/tubemq-all/README.md @@ -3,7 +3,7 @@ TubeMQ standalone is available for development and experience. ##### Pull Image ``` -docker pull inlong/tubemq-all:latest +docker pull inlong/tubemq-all:1.13.0 ``` ##### Start Standalone Container diff --git a/inlong-tubemq/tubemq-docker/tubemq-manager/README.md b/inlong-tubemq/tubemq-docker/tubemq-manager/README.md index b693a9f95ac..0f31189900a 100644 --- a/inlong-tubemq/tubemq-docker/tubemq-manager/README.md +++ b/inlong-tubemq/tubemq-docker/tubemq-manager/README.md @@ -3,7 +3,7 @@ TubeMQ manager is available for development and experience. ##### Pull Image ``` -docker pull inlong/tubemq-manager:latest +docker pull inlong/tubemq-manager:1.13.0 ``` ##### Start Container From e8e151fa20534fdaf7e89778aed3638e238ae869 Mon Sep 17 00:00:00 2001 From: fuwenkai <834260992@qq.com> Date: Wed, 24 Jul 2024 12:15:47 +0800 Subject: [PATCH 2/4] [INLONG-10662][Release] Change the tag of Docker images to 1.13.0 --- inlong-tubemq/tubemq-docker/tubemq-all/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inlong-tubemq/tubemq-docker/tubemq-all/README.md b/inlong-tubemq/tubemq-docker/tubemq-all/README.md index ad9ae8b074e..49072d1dd36 100644 --- a/inlong-tubemq/tubemq-docker/tubemq-all/README.md +++ b/inlong-tubemq/tubemq-docker/tubemq-all/README.md @@ -8,7 +8,7 @@ docker pull inlong/tubemq-all:1.13.0 ##### Start Standalone Container ``` -docker run -p 8080:8080 -p 8715:8715 -p 8123:8123 -p 2181:2181 --name tubemq -d inlong/tubemq-all:latest +docker run -p 8080:8080 -p 8715:8715 -p 8123:8123 -p 2181:2181 --name tubemq -d inlong/tubemq-all:1.13.0 ``` this command will start zookeeper/master/broker service in one container. #### Add Topic From 4c82d7487f1ea7d9431a102e202669135a633802 Mon Sep 17 00:00:00 2001 From: fuwenkai <834260992@qq.com> Date: Wed, 24 Jul 2024 12:18:02 +0800 Subject: [PATCH 3/4] [INLONG-10662][Release] Change the tag of Docker images to 1.13.0 --- docker/kubernetes/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/kubernetes/values.yaml b/docker/kubernetes/values.yaml index ac9ebc73822..3490376a70f 100644 --- a/docker/kubernetes/values.yaml +++ b/docker/kubernetes/values.yaml @@ -52,10 +52,10 @@ images: tag: 8.0.28 zookeeper: repository: zookeeper - tag: 1.13.0 + tag: latest initContainer: repository: busybox - tag: 1.13.0 + tag: latest pullPolicy: "Always" ingress: From 3b6affd6e6bb07cbdd45aefb035fb6faa3c1a5de Mon Sep 17 00:00:00 2001 From: fuwenkai <834260992@qq.com> Date: Wed, 24 Jul 2024 12:30:26 +0800 Subject: [PATCH 4/4] [INLONG-10662][Release] Change the tag of Docker images to 1.13.0 --- docker/kubernetes/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/kubernetes/README.md b/docker/kubernetes/README.md index 94b4977cbef..68112866632 100644 --- a/docker/kubernetes/README.md +++ b/docker/kubernetes/README.md @@ -74,7 +74,7 @@ The configuration file is [values.yaml](values.yaml), and the following tables l | `timezone` | `Asia/Shanghai` | World time and date for cities in all time zones | | `images.pullPolicy` | `IfNotPresent` | Image pull policy. One of `Always`, `Never`, `IfNotPresent` | | `images..repository` | | Docker image repository for the component | -| `images..tag` | `1.13.0` | Docker image tag for the component | +| `images..tag` | `1.13.0` | Docker image tag for the component | | `.component` | | Component name | | `.replicas` | `1` | Replicas is the desired number of replicas of a given Template | | `.podManagementPolicy` | `OrderedReady` | PodManagementPolicy controls how pods are created during initial scale up, when replacing pods on nodes, or when scaling down |