fix: docker doc refine (#20101)
This commit is contained in:
parent
69778c948a
commit
db560be500
|
@ -273,22 +273,16 @@ password: taosdata
|
|||
|
||||
## Start the TDengine cluster with docker-compose
|
||||
|
||||
1. The following docker-compose file starts a TDengine cluster with two replicas, two management nodes, two data nodes, and one arbitrator.
|
||||
1. The following docker-compose file starts a TDengine cluster with three nodes.
|
||||
|
||||
```docker
|
||||
```yml
|
||||
version: "3"
|
||||
services:
|
||||
arbitrator:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: tarbitrator
|
||||
td-1:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
environment:
|
||||
TAOS_FQDN: "td-1"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td1:/var/lib/taos/
|
||||
- taoslog-td1:/var/log/taos/
|
||||
|
@ -297,25 +291,30 @@ password: taosdata
|
|||
environment:
|
||||
TAOS_FQDN: "td-2"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td2:/var/lib/taos/
|
||||
- taoslog-td2:/var/log/taos/
|
||||
td-3:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
environment:
|
||||
TAOS_FQDN: "td-3"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
volumes:
|
||||
- taosdata-td3:/var/lib/taos/
|
||||
- taoslog-td3:/var/log/taos/
|
||||
volumes:
|
||||
taosdata-td1:
|
||||
taoslog-td1:
|
||||
taosdata-td2:
|
||||
taoslog-td2:
|
||||
taosdata-td3:
|
||||
taoslog-td3:
|
||||
```
|
||||
|
||||
:::note
|
||||
|
||||
- The `VERSION` environment variable is used to set the tdengine image tag
|
||||
- `TAOS_FIRST_EP` must be set on the newly created instance so that it can join the TDengine cluster; if there is a high availability requirement, `TAOS_SECOND_EP` needs to be used at the same time
|
||||
- `TAOS_REPLICA` is used to set the default number of database replicas. Its value range is [1,3]
|
||||
We recommend setting it with `TAOS_ARBITRATOR` to use arbitrator in a two-nodes environment.
|
||||
:::
|
||||
|
||||
2. Start the cluster
|
||||
|
@ -349,12 +348,13 @@ password: taosdata
|
|||
$ docker-compose exec td-1 taos -s "show dnodes"
|
||||
|
||||
taos> show dnodes
|
||||
id | end_point | vnodes | cores | status | role | create_time | offline reason |
|
||||
id | endpoint | vnodes | support_vnodes | status | create_time | note |
|
||||
======================================================================================================================================
|
||||
1 | td-1:6030 | 1 | 8 | ready | any | 2022-01-18 02:47:42.871 | |
|
||||
2 | td-2:6030 | 0 | 8 | ready | any | 2022-01-18 02:47:43.518 | |
|
||||
0 | arbitrator:6042 | 0 | 0 | ready | arb | 2022-01-18 02:47:43.633 | - |
|
||||
Query OK, 3 row(s) in set (0.000811s)
|
||||
1 | td-1:6030 | 0 | 32 | ready | 2022-08-19 07:57:29.971 | |
|
||||
2 | td-2:6030 | 0 | 32 | ready | 2022-08-19 07:57:31.415 | |
|
||||
3 | td-3:6030 | 0 | 32 | ready | 2022-08-19 07:57:31.417 | |
|
||||
Query OK, 3 rows in database (0.021262s)
|
||||
|
||||
```
|
||||
|
||||
## taosAdapter
|
||||
|
@ -373,19 +373,13 @@ password: taosdata
|
|||
|
||||
Suppose you want to deploy multiple taosAdapters to improve throughput and provide high availability. In that case, the recommended configuration method uses a reverse proxy such as Nginx to offer a unified access entry. For specific configuration methods, please refer to the official documentation of Nginx. Here is an example:
|
||||
|
||||
```docker
|
||||
```yml
|
||||
version: "3"
|
||||
|
||||
networks:
|
||||
inter:
|
||||
api:
|
||||
|
||||
services:
|
||||
arbitrator:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: tarbitrator
|
||||
networks:
|
||||
- inter
|
||||
td-1:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
networks:
|
||||
|
@ -393,9 +387,6 @@ password: taosdata
|
|||
environment:
|
||||
TAOS_FQDN: "td-1"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td1:/var/lib/taos/
|
||||
- taoslog-td1:/var/log/taos/
|
||||
|
@ -406,15 +397,12 @@ password: taosdata
|
|||
environment:
|
||||
TAOS_FQDN: "td-2"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td2:/var/lib/taos/
|
||||
- taoslog-td2:/var/log/taos/
|
||||
adapter:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: taosadapter
|
||||
entrypoint: "taosadapter"
|
||||
networks:
|
||||
- inter
|
||||
environment:
|
||||
|
@ -428,7 +416,6 @@ password: taosdata
|
|||
- adapter
|
||||
networks:
|
||||
- inter
|
||||
- api
|
||||
ports:
|
||||
- 6041:6041
|
||||
- 6044:6044/udp
|
||||
|
|
|
@ -18,65 +18,58 @@ TDengine is an open-sourced big data platform under [GNU AGPL v3.0](http://www.g
|
|||
|
||||
## How to use this image
|
||||
|
||||
### Start a TDengine instance with RESTful API exposed
|
||||
### Starting TDengine
|
||||
|
||||
Simply, you can use `docker run` to start a TDengine instance and connect it with restful connectors(eg. [JDBC-RESTful](https://www.taosdata.com/cn/documentation/connector/java)).
|
||||
The TDengine image starts with the HTTP service activated by default, using the following command:
|
||||
|
||||
```bash
|
||||
```shell
|
||||
docker run -d --name tdengine -p 6041:6041 tdengine/tdengine
|
||||
```
|
||||
|
||||
This command starts a docker container by name `tdengine` with TDengine server running, and maps the container's HTTP port 6041 to the host's port 6041. If you have `curl` in your host, you can list the databases by the command:
|
||||
The above command starts a container named "tdengine" and maps the HTTP service port 6041 to the host port 6041. You can verify that the HTTP service provided in this container is available using the following command.
|
||||
|
||||
```bash
|
||||
```shell
|
||||
curl -u root:taosdata -d "show databases" localhost:6041/rest/sql
|
||||
```
|
||||
|
||||
You can execute the `taos` shell command in the container:
|
||||
The TDengine client taos can be executed in this container to access TDengine using the following command.
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker exec -it tdengine taos
|
||||
|
||||
Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
|
||||
Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
|
||||
|
||||
taos> show databases;
|
||||
name | created_time | ntables | vgroups | replica | quorum | days | keep | cache(MB) | blocks | minrows | maxrows | wallevel | fsync | comp | cachelast | precision | update | status |
|
||||
====================================================================================================================================================================================================================================================================================
|
||||
log | 2022-01-17 13:57:22.270 | 10 | 1 | 1 | 1 | 10 | 30 | 1 | 3 | 100 | 4096 | 1 | 3000 | 2 | 0 | us | 0 | ready |
|
||||
Query OK, 1 row(s) in set (0.002843s)
|
||||
name |
|
||||
=================================
|
||||
information_schema |
|
||||
performance_schema |
|
||||
Query OK, 2 row(s) in set (0.002843s)
|
||||
```
|
||||
|
||||
Since TDengine use container hostname to establish connections, it's a bit more complex to use TDengine CLI and native connectors(such as JDBC-JNI) with TDengine container instance. This is the recommended way to expose ports and use TDengine with docker in simple cases. If you want to use TDengine CLI or taosc/connectors smoothly outside the `tdengine` container, see next use cases that match you need.
|
||||
The TDengine server running in the container uses the container's hostname to establish a connection. Using TDengine CLI or various connectors (such as JDBC-JNI) to access the TDengine inside the container from outside the container is more complicated. So the above is the simplest way to access the TDengine service in the container and is suitable for some simple scenarios. Please refer to the next section if you want to access the TDengine service in the container from outside the container using TDengine CLI or various connectors for complex scenarios.
|
||||
|
||||
### Start with host network
|
||||
### Start TDengine on the host network
|
||||
|
||||
```bash
|
||||
```shell
|
||||
docker run -d --name tdengine --network host tdengine/tdengine
|
||||
```
|
||||
|
||||
Starts container with `host` network will use host's hostname as fqdn instead of container id. It's much like starting natively with `systemd` in host. After installing the client, you can use `taos` shell as normal in host path.
|
||||
The above command starts TDengine on the host network and uses the host's FQDN to establish a connection instead of the container's hostname. It is the equivalent of using `systemctl` to start TDengine on the host. If the TDengine client is already installed on the host, you can access it directly with the following command.
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ taos
|
||||
|
||||
Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
|
||||
Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
|
||||
|
||||
taos> show dnodes;
|
||||
id | end_point | vnodes | cores | status | role | create_time | offline reason |
|
||||
======================================================================================================================================
|
||||
1 | host:6030 | 1 | 8 | ready | any | 2022-01-17 22:10:32.619 | |
|
||||
1 | myhost:6030 | 1 | 8 | ready | any | 2022-01-17 22:10:32.619 | |
|
||||
Query OK, 1 row(s) in set (0.003233s)
|
||||
```
|
||||
|
||||
### Start with exposed ports and specified hostname
|
||||
### Start TDengine with the specified hostname and port
|
||||
|
||||
Set the fqdn explicitly will help you to use in other environment or applications. We provide environment variable `TAOS_FQDN` or `fqdn` config option to explicitly set the hostname used by TDengine container instance(s).
|
||||
The `TAOS_FQDN` environment variable or the `fqdn` configuration item in `taos.cfg` allows TDengine to establish a connection at the specified hostname. This approach provides greater flexibility for deployment.
|
||||
|
||||
Use `TAOS_FQDN` variable within `docker run` command:
|
||||
|
||||
```bash
|
||||
```shell
|
||||
docker run -d \
|
||||
--name tdengine \
|
||||
-e TAOS_FQDN=tdengine \
|
||||
|
@ -85,79 +78,58 @@ docker run -d \
|
|||
tdengine/tdengine
|
||||
```
|
||||
|
||||
This command starts a docker container with TDengine server running and maps the container's TCP ports from 6030 to 6049 to the host's ports from 6030 to 6049 with TCP protocol and UDP ports range 6030-6039 to the host's UDP ports 6030-6039. If the host is already running TDengine server and occupying the same port(s), you need to map the container's port to a different unused port segment. (Please see TDengine 2.0 Port Description for details). In order to support TDengine clients accessing TDengine server services, both TCP and UDP ports need to be exposed by default(unless `rpcForceTcp` is set to `1`).
|
||||
The above command starts a TDengine service in the container, which listens to the hostname tdengine, and maps the container's port segment 6030 to 6049 to the host's port segment 6030 to 6049 (both TCP and UDP ports need to be mapped). If the port segment is already occupied on the host, you can modify the above command to specify a free port segment on the host. If `rpcForceTcp` is set to `1`, you can map only the TCP protocol.
|
||||
|
||||
If you want to use TDengine CLI or native connectors([JDBC-JNI](https://www.taosdata.com/cn/documentation/connector/java), or [driver-go](https://github.com/taosdata/driver-go)), you need to make sure the `TAOS_FQDN` is resolvable at `/etc/hosts` or with custom DNS service.
|
||||
Next, ensure the hostname "tdengine" is resolvable in `/etc/hosts`.
|
||||
|
||||
If you set the `TAOS_FQDN` to host's hostname, it will works as using `hosts` network like previous use case. Otherwise, like in `-e TAOS_FQDN=tdengine`, you can add the hostname record `tdengine` into `/etc/hosts` (use `127.0.0.1` here in host path, if use TDengine client/application in other hosts, you should set the right ip to the host eg. `192.168.10.1`(check the real ip in host with `hostname -i` or `ip route list default`) to make the TDengine endpoint resolvable):
|
||||
|
||||
```bash
|
||||
```shell
|
||||
echo 127.0.0.1 tdengine |sudo tee -a /etc/hosts
|
||||
```
|
||||
|
||||
Then you can use `taos` with the host `tdengine`:
|
||||
Finally, the TDengine service can be accessed from the TDengine CLI or any connector with "tdengine" as the server address.
|
||||
|
||||
```bash
|
||||
taos -h tdengine
|
||||
```shell
|
||||
taos -h tdengine -P 6030
|
||||
```
|
||||
|
||||
Or develop/test applications with native connectors. As in python:
|
||||
If set `TAOS_FQDN` to the same hostname, the effect is the same as "Start TDengine on host network".
|
||||
|
||||
```python
|
||||
import taos;
|
||||
conn = taos.connect(host = "tdengine")
|
||||
res = conn.query("show databases")
|
||||
for row in res.fetch_all_into_dict():
|
||||
print(row)
|
||||
```
|
||||
### Start TDengine on the specified network
|
||||
|
||||
See the results:
|
||||
You can also start TDengine on a specific network. Perform the following steps:
|
||||
|
||||
```bash
|
||||
Python 3.8.10 (default, Nov 26 2021, 20:14:08)
|
||||
[GCC 9.3.0] on linux
|
||||
Type "help", "copyright", "credits" or "license" for more information.
|
||||
>>> import taos;
|
||||
>>> conn = taos.connect(host = "tdengine")
|
||||
>>> res = conn.query("show databases")
|
||||
>>> for row in res.fetch_all_into_dict():
|
||||
... print(row)
|
||||
...
|
||||
{'name': 'log', 'created_time': datetime.datetime(2022, 1, 17, 22, 56, 2, 490000), 'ntables': 11, 'vgroups': 1, 'replica': 1, 'quorum': 1, 'days': 10, 'keep': '30', 'cache(MB)': 1, 'blocks': 3, 'minrows': 100, 'maxrows': 4096, 'wallevel': 1, 'fsync': 3000, 'comp': 2, 'cachelast': 0, 'precision': 'us', 'update': 0, 'status': 'ready'}
|
||||
```
|
||||
1. First, create a docker network named `td-net`
|
||||
|
||||
### Start with specific network
|
||||
|
||||
Alternatively, you can use TDengine natively by using specific network.
|
||||
|
||||
First, create network for TDengine server and client/application.
|
||||
|
||||
```bash
|
||||
```shell
|
||||
docker network create td-net
|
||||
```
|
||||
|
||||
Start TDengine instance with service name as fqdn (explicitly set with `TAOS_FQDN`):
|
||||
2. Start TDengine
|
||||
|
||||
```bash
|
||||
Start the TDengine service on the `td-net` network with the following command:
|
||||
|
||||
```shell
|
||||
docker run -d --name tdengine --network td-net \
|
||||
-e TAOS_FQDN=tdengine \
|
||||
tdengine/tdengine
|
||||
```
|
||||
|
||||
Start TDengine client in another container with the specific network:
|
||||
3. Start the TDengine client in another container on the same network
|
||||
|
||||
```bash
|
||||
```shell
|
||||
docker run --rm -it --network td-net -e TAOS_FIRST_EP=tdengine tdengine/tdengine taos
|
||||
# or
|
||||
docker run --rm -it --network td-net -e tdengine/tdengine taos -h tdengine
|
||||
#docker run --rm -it --network td-net -e tdengine/tdengine taos -h tdengine
|
||||
```
|
||||
|
||||
When you build your application with docker, you should add the TDengine client in the dockerfile, as based on `ubuntu:20.04` image, install the client like this:
|
||||
### Launching a client application in a container
|
||||
|
||||
```dockerfile
|
||||
If you want to start your application in a container, you need to add the corresponding dependencies on TDengine to the image as well, e.g.
|
||||
|
||||
```docker
|
||||
FROM ubuntu:20.04
|
||||
RUN apt-get update && apt-get install -y wget
|
||||
ENV TDENGINE_VERSION=2.4.0.0
|
||||
ENV TDENGINE_VERSION=3.0.0.0
|
||||
RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& cd TDengine-client-${TDENGINE_VERSION} \
|
||||
|
@ -169,10 +141,7 @@ RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENG
|
|||
#CMD ["app"]
|
||||
```
|
||||
|
||||
Here is an Go example app:
|
||||
|
||||
<!-- code-spell-checker:disable -->
|
||||
<!-- markdownlint-disable MD010 -->
|
||||
Here is an example GO program:
|
||||
|
||||
```go
|
||||
/*
|
||||
|
@ -186,7 +155,7 @@ import (
|
|||
"fmt"
|
||||
"time"
|
||||
|
||||
_ "github.com/taosdata/driver-go/v2/taosSql"
|
||||
_ "github.com/taosdata/driver-go/v3/taosSql"
|
||||
)
|
||||
|
||||
type config struct {
|
||||
|
@ -257,14 +226,11 @@ func checkErr(err error, prompt string) {
|
|||
}
|
||||
```
|
||||
|
||||
<!-- markdownlint-enable MD010 -->
|
||||
<!-- code-spell-checker:enable -->
|
||||
Here is the full Dockerfile:
|
||||
|
||||
Full version of dockerfile could be:
|
||||
|
||||
```dockerfile
|
||||
```docker
|
||||
FROM golang:1.17.6-buster as builder
|
||||
ENV TDENGINE_VERSION=2.4.0.0
|
||||
ENV TDENGINE_VERSION=3.0.0.0
|
||||
RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& cd TDengine-client-${TDENGINE_VERSION} \
|
||||
|
@ -274,11 +240,13 @@ RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENG
|
|||
WORKDIR /usr/src/app/
|
||||
ENV GOPROXY="https://goproxy.io,direct"
|
||||
COPY ./main.go ./go.mod ./go.sum /usr/src/app/
|
||||
RUN go env && go mod tidy && go build
|
||||
RUN go env
|
||||
RUN go mod tidy
|
||||
RUN go build
|
||||
|
||||
FROM ubuntu:20.04
|
||||
RUN apt-get update && apt-get install -y wget
|
||||
ENV TDENGINE_VERSION=2.4.0.0
|
||||
ENV TDENGINE_VERSION=3.0.0.0
|
||||
RUN wget -c https://www.taosdata.com/assets-download/3.0/TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& tar xvf TDengine-client-${TDENGINE_VERSION}-Linux-x64.tar.gz \
|
||||
&& cd TDengine-client-${TDENGINE_VERSION} \
|
||||
|
@ -291,9 +259,9 @@ COPY --from=builder /usr/src/app/app /usr/bin/
|
|||
CMD ["app"]
|
||||
```
|
||||
|
||||
Suppose you have `main.go`, `go.mod` `go.sum`, `app.dockerfile`, build the app and run it with network `td-net`:
|
||||
Now that we have `main.go`, `go.mod`, `go.sum`, `app.dockerfile`, we can build the application and start it on the `td-net` network.
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker build -t app -f app.dockerfile
|
||||
$ docker run --rm --network td-net app -h tdengine -p 6030
|
||||
============= args parse result: =============
|
||||
|
@ -316,26 +284,18 @@ password: taosdata
|
|||
2022-01-18 01:43:51.029 +0000 UTC 3
|
||||
```
|
||||
|
||||
Now you must be much familiar with developing and testing with TDengine, let's see some more complex cases.
|
||||
### Start the TDengine cluster with docker-compose
|
||||
|
||||
### Start with docker-compose with multiple nodes(instances)
|
||||
1. The following docker-compose file starts a TDengine cluster with three nodes.
|
||||
|
||||
Start a 2-replicas-2-mnodes-2-dnodes-1-arbitrator TDengine cluster with `docker-compose` is quite simple. Save the file as `docker-compose.yml`:
|
||||
|
||||
```yaml
|
||||
```yml
|
||||
version: "3"
|
||||
services:
|
||||
arbitrator:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: tarbitrator
|
||||
td-1:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
environment:
|
||||
TAOS_FQDN: "td-1"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td1:/var/lib/taos/
|
||||
- taoslog-td1:/var/log/taos/
|
||||
|
@ -344,32 +304,36 @@ services:
|
|||
environment:
|
||||
TAOS_FQDN: "td-2"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td2:/var/lib/taos/
|
||||
- taoslog-td2:/var/log/taos/
|
||||
td-3:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
environment:
|
||||
TAOS_FQDN: "td-3"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
volumes:
|
||||
- taosdata-td3:/var/lib/taos/
|
||||
- taoslog-td3:/var/log/taos/
|
||||
volumes:
|
||||
taosdata-td1:
|
||||
taoslog-td1:
|
||||
taosdata-td2:
|
||||
taoslog-td2:
|
||||
taosdata-td3:
|
||||
taoslog-td3:
|
||||
```
|
||||
|
||||
You may notice that:
|
||||
:::note
|
||||
|
||||
- We use `VERSION` environment variable to set `tdengine` image tag version once.
|
||||
- **`TAOS_FIRST_EP`** **MUST** be set to join the newly created instances into an existing TDengine cluster. If you want more instances, use `TAOS_SECOND_EP` in case of HA(High Availability) concerns.
|
||||
- `TAOS_NUM_OF_MNODES` is for setting number of mnodes for the cluster.
|
||||
- `TAOS_REPLICA` set the default database replicas, `2` means there're one master and one slave copy of data. The `replica` option should be `1 <= replica <= 3`, and not greater than dnodes number.
|
||||
- `TAOS_ARBITRATOR` set the arbitrator entrypoint of the cluster for failover/election stuff. It's better to use arbitrator in a two nodes cluster.
|
||||
- The way to start an arbitrator service is as easy as abc: just add command name `tarbitrator`(which is the binary name of arbitrator daemon) in docker-compose service option: `command: tarbitrator`, and everything is ok now.
|
||||
- The `VERSION` environment variable is used to set the tdengine image tag
|
||||
- `TAOS_FIRST_EP` must be set on the newly created instance so that it can join the TDengine cluster; if there is a high availability requirement, `TAOS_SECOND_EP` needs to be used at the same time
|
||||
:::
|
||||
|
||||
Now run `docker-compose up -d` with version specified:
|
||||
2. Start the cluster
|
||||
|
||||
```bash
|
||||
$ VERSION=2.4.0.0 docker-compose up -d
|
||||
```shell
|
||||
$ VERSION=3.0.0.0 docker-compose up -d
|
||||
Creating network "test_default" with the default driver
|
||||
Creating volume "test_taosdata-td1" with default driver
|
||||
Creating volume "test_taoslog-td1" with default driver
|
||||
|
@ -380,9 +344,9 @@ Creating test_arbitrator_1 ... done
|
|||
Creating test_td-2_1 ... done
|
||||
```
|
||||
|
||||
Check the status:
|
||||
3. Check the status of each node
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker-compose ps
|
||||
Name Command State Ports
|
||||
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
@ -391,32 +355,28 @@ test_td-1_1 /usr/bin/entrypoint.sh taosd Up 6030/tcp, 6031/tcp,
|
|||
test_td-2_1 /usr/bin/entrypoint.sh taosd Up 6030/tcp, 6031/tcp, 6032/tcp, 6033/tcp, 6034/tcp, 6035/tcp, 6036/tcp, 6037/tcp, 6038/tcp, 6039/tcp, 6040/tcp, 6041/tcp, 6042/tcp
|
||||
```
|
||||
|
||||
Check dnodes with TDengine CLI:
|
||||
4. Show dnodes via TDengine CLI
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker-compose exec td-1 taos -s "show dnodes"
|
||||
|
||||
Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
|
||||
Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
|
||||
|
||||
taos> show dnodes
|
||||
id | end_point | vnodes | cores | status | role | create_time | offline reason |
|
||||
id | endpoint | vnodes | support_vnodes | status | create_time | note |
|
||||
======================================================================================================================================
|
||||
1 | td-1:6030 | 1 | 8 | ready | any | 2022-01-18 02:47:42.871 | |
|
||||
2 | td-2:6030 | 0 | 8 | ready | any | 2022-01-18 02:47:43.518 | |
|
||||
0 | arbitrator:6042 | 0 | 0 | ready | arb | 2022-01-18 02:47:43.633 | - |
|
||||
Query OK, 3 row(s) in set (0.000811s)
|
||||
1 | td-1:6030 | 0 | 32 | ready | 2022-08-19 07:57:29.971 | |
|
||||
2 | td-2:6030 | 0 | 32 | ready | 2022-08-19 07:57:31.415 | |
|
||||
3 | td-3:6030 | 0 | 32 | ready | 2022-08-19 07:57:31.417 | |
|
||||
Query OK, 3 rows in database (0.021262s)
|
||||
|
||||
```
|
||||
|
||||
### Start a TDengine cluster with scaled taosadapter service
|
||||
## taosAdapter
|
||||
|
||||
In previous use case, you could see the way to start other services built with TDengine(`taosd` as the default command). There's another important service you should know:
|
||||
1. taosAdapter is enabled by default in the TDengine container. If you want to disable it, specify the environment variable `TAOS_DISABLE_ADAPTER=true` at startup
|
||||
|
||||
> **taosAdapter** is a TDengine’s companion tool and is a bridge/adapter between TDengine cluster and application. It provides an easy-to-use and efficient way to ingest data from data collections agents(like Telegraf, StatsD, CollectD) directly. It also provides InfluxDB/OpenTSDB compatible data ingestion interface to allow InfluxDB/OpenTSDB applications to immigrate to TDengine seamlessly.
|
||||
2. At the same time, for flexible deployment, taosAdapter can be started in a separate container
|
||||
|
||||
`taosadapter` is running inside `tdengine` image by default, you can disable it by `TAOS_DISABLE_ADAPTER=true`. Running `taosadapter` in a separate container is like how `arbitrator` does:
|
||||
|
||||
```yaml
|
||||
```docker
|
||||
services:
|
||||
# ...
|
||||
adapter:
|
||||
|
@ -424,21 +384,15 @@ services:
|
|||
command: taosadapter
|
||||
```
|
||||
|
||||
`taosadapter` could be scaled with docker-compose, so that you can manage the `taosadapter` nodes easily. Here is an example shows 4-`taosadapter` instances in a TDengine cluster(much like previous use cases):
|
||||
Suppose you want to deploy multiple taosAdapters to improve throughput and provide high availability. In that case, the recommended configuration method uses a reverse proxy such as Nginx to offer a unified access entry. For specific configuration methods, please refer to the official documentation of Nginx. Here is an example:
|
||||
|
||||
```yaml
|
||||
```yml
|
||||
version: "3"
|
||||
|
||||
networks:
|
||||
inter:
|
||||
api:
|
||||
|
||||
services:
|
||||
arbitrator:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: tarbitrator
|
||||
networks:
|
||||
- inter
|
||||
td-1:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
networks:
|
||||
|
@ -446,9 +400,6 @@ services:
|
|||
environment:
|
||||
TAOS_FQDN: "td-1"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td1:/var/lib/taos/
|
||||
- taoslog-td1:/var/log/taos/
|
||||
|
@ -459,15 +410,12 @@ services:
|
|||
environment:
|
||||
TAOS_FQDN: "td-2"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td2:/var/lib/taos/
|
||||
- taoslog-td2:/var/log/taos/
|
||||
adapter:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: taosadapter
|
||||
entrypoint: "taosadapter"
|
||||
networks:
|
||||
- inter
|
||||
environment:
|
||||
|
@ -481,7 +429,6 @@ services:
|
|||
- adapter
|
||||
networks:
|
||||
- inter
|
||||
- api
|
||||
ports:
|
||||
- 6041:6041
|
||||
- 6044:6044/udp
|
||||
|
@ -504,100 +451,14 @@ volumes:
|
|||
taoslog-td2:
|
||||
```
|
||||
|
||||
Start the cluster:
|
||||
## Deploy with docker swarm
|
||||
|
||||
```bash
|
||||
$ VERSION=2.4.0.0 docker-compose up -d
|
||||
Creating network "docker_inter" with the default driver
|
||||
Creating network "docker_api" with the default driver
|
||||
Creating volume "docker_taosdata-td1" with default driver
|
||||
Creating volume "docker_taoslog-td1" with default driver
|
||||
Creating volume "docker_taosdata-td2" with default driver
|
||||
Creating volume "docker_taoslog-td2" with default driver
|
||||
Creating docker_td-2_1 ... done
|
||||
Creating docker_arbitrator_1 ... done
|
||||
Creating docker_td-1_1 ... done
|
||||
Creating docker_adapter_1 ... done
|
||||
Creating docker_adapter_2 ... done
|
||||
Creating docker_adapter_3 ... done
|
||||
```
|
||||
If you want to deploy a container-based TDengine cluster on multiple hosts, you can use docker swarm. First, to establish a docker swarm cluster on these hosts, please refer to the official docker documentation.
|
||||
|
||||
It will start a TDengine cluster with two dnodes and four taosadapter instances, expose ports 6041/tcp and 6044/udp to host.
|
||||
The docker-compose file can refer to the previous section. Here is the command to start TDengine with docker swarm:
|
||||
|
||||
`6041` is the RESTful API endpoint port, you can verify that the RESTful interface taosAdapter provides working using the `curl` command.
|
||||
|
||||
```bash
|
||||
$ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'show databases;' 127.0.0.1:6041/rest/sql
|
||||
{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"column_meta":[["name",8,32],["created_time",9,8],["ntables",4,4],["vgroups",4,4],["replica",3,2],["quorum",3,2],["days",3,2],["keep",8,24],["cache(MB)",4,4],["blocks",4,4],["minrows",4,4],["maxrows",4,4],["wallevel",2,1],["fsync",4,4],["comp",2,1],["cachelast",2,1],["precision",8,3],["update",2,1],["status",8,10]],"data":[["log","2022-01-18 04:37:42.902",16,1,1,1,10,"30",1,3,100,4096,1,3000,2,0,"us",0,"ready"]],"rows":1}
|
||||
```
|
||||
|
||||
If you run curl in batch(here we use [hyperfine](https://github.com/sharkdp/hyperfine) - a command-line benchmarking tool), the requests are balanced into 4 adapter instances.
|
||||
|
||||
```bash
|
||||
hyperfine -m10 'curl -u root:taosdata localhost:6041/rest/sql -d "describe log.log"'
|
||||
```
|
||||
|
||||
View the logs with `docker-compose logs`:
|
||||
|
||||
```bash
|
||||
$ docker-compose logs adapter
|
||||
# some logs skipped
|
||||
adapter_2 | 01/18 04:57:44.616529 00000039 TAOS_ADAPTER info "| 200 | 162.185µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=18
|
||||
adapter_1 | 01/18 04:57:44.627695 00000039 TAOS_ADAPTER info "| 200 | 145.485µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=17
|
||||
adapter_3 | 01/18 04:57:44.639165 00000040 TAOS_ADAPTER info "| 200 | 146.913µs | 172.21.0.9 | POST | /rest/sql " sessionID=17 model=web
|
||||
adapter_4 | 01/18 04:57:44.650829 00000039 TAOS_ADAPTER info "| 200 | 153.201µs | 172.21.0.9 | POST | /rest/sql " sessionID=17 model=web
|
||||
adapter_2 | 01/18 04:57:44.662422 00000039 TAOS_ADAPTER info "| 200 | 211.393µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=19
|
||||
adapter_1 | 01/18 04:57:44.673426 00000039 TAOS_ADAPTER info "| 200 | 154.714µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=18
|
||||
adapter_3 | 01/18 04:57:44.684788 00000040 TAOS_ADAPTER info "| 200 | 131.876µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=18
|
||||
adapter_4 | 01/18 04:57:44.696261 00000039 TAOS_ADAPTER info "| 200 | 162.173µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=18
|
||||
adapter_2 | 01/18 04:57:44.707414 00000039 TAOS_ADAPTER info "| 200 | 164.419µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=20
|
||||
adapter_1 | 01/18 04:57:44.720842 00000039 TAOS_ADAPTER info "| 200 | 179.374µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=19
|
||||
adapter_3 | 01/18 04:57:44.732184 00000040 TAOS_ADAPTER info "| 200 | 141.174µs | 172.21.0.9 | POST | /rest/sql " sessionID=19 model=web
|
||||
adapter_4 | 01/18 04:57:44.744024 00000039 TAOS_ADAPTER info "| 200 | 159.774µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=19
|
||||
adapter_2 | 01/18 04:57:44.773732 00000039 TAOS_ADAPTER info "| 200 | 178.993µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=21
|
||||
adapter_1 | 01/18 04:57:44.796518 00000039 TAOS_ADAPTER info "| 200 | 238.24µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=20
|
||||
adapter_3 | 01/18 04:57:44.810744 00000040 TAOS_ADAPTER info "| 200 | 176.133µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=20
|
||||
adapter_4 | 01/18 04:57:44.826395 00000039 TAOS_ADAPTER info "| 200 | 149.215µs | 172.21.0.9 | POST | /rest/sql " model=web sessionID=20
|
||||
```
|
||||
|
||||
`6044/udp` is the [StatsD](https://github.com/statsd/statsd)-compatible port, you can verify this feature with `nc` command(usually provided by `netcat` package).
|
||||
|
||||
```bash
|
||||
echo "foo:1|c" | nc -u -w0 127.0.0.1 6044
|
||||
```
|
||||
|
||||
Check the result in `taos` shell with `docker-compose exec`:
|
||||
|
||||
```bash
|
||||
$ dc exec td-1 taos
|
||||
|
||||
Welcome to the TDengine shell from Linux, Client Version:2.4.0.0
|
||||
Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
|
||||
|
||||
taos> show databases;
|
||||
name | created_time | ntables | vgroups | replica | quorum | days | keep | cache(MB) | blocks | minrows | maxrows | wallevel | fsync | comp | cachelast | precision | update | status |
|
||||
====================================================================================================================================================================================================================================================================================
|
||||
log | 2022-01-18 04:37:42.902 | 17 | 1 | 1 | 1 | 10 | 30 | 1 | 3 | 100 | 4096 | 1 | 3000 | 2 | 0 | us | 0 | ready |
|
||||
statsd | 2022-01-18 04:45:02.563 | 1 | 1 | 2 | 1 | 10 | 3650 | 16 | 6 | 100 | 4096 | 1 | 3000 | 2 | 0 | ns | 2 | ready |
|
||||
Query OK, 2 row(s) in set (0.001838s)
|
||||
|
||||
taos> select * from statsd.foo;
|
||||
ts | value | metric_type |
|
||||
=======================================================================================
|
||||
2022-01-18 04:45:02.563422822 | 1 | counter |
|
||||
Query OK, 1 row(s) in set (0.003854s)
|
||||
```
|
||||
|
||||
Use `docker-compose up -d adapter=1 to reduce the instances to 1
|
||||
|
||||
### Deploy TDengine cluster in Docker Swarm with `docker-compose.yml`
|
||||
|
||||
If you use docker swarm mode, it will schedule arbitrator/taosd/taosadapter services into different hosts automatically. If you've no experience with k8s/kubernetes, this is the most convenient way to scale out the TDengine cluster with multiple hosts/servers.
|
||||
|
||||
Use the `docker-compose.yml` file in previous use case, and deploy with `docker stack` or `docker deploy`:
|
||||
|
||||
```bash
|
||||
$ VERSION=2.4.0 docker stack deploy -c docker-compose.yml taos
|
||||
```shell
|
||||
$ VERSION=3.0.0.0 docker stack deploy -c docker-compose.yml taos
|
||||
Creating network taos_inter
|
||||
Creating network taos_api
|
||||
Creating service taos_arbitrator
|
||||
|
@ -607,39 +468,33 @@ Creating service taos_adapter
|
|||
Creating service taos_nginx
|
||||
```
|
||||
|
||||
Now you've created a TDengine cluster with multiple host servers.
|
||||
Checking status:
|
||||
|
||||
Use `docker service` or `docker stack` to manage the cluster:
|
||||
|
||||
<!-- code-spell-checker:disable -->
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker stack ps taos
|
||||
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS
|
||||
79ni8temw59n taos_nginx.1 nginx:latest TM1701 Running Running about a minute ago
|
||||
3e94u72msiyg taos_adapter.1 tdengine/tdengine:2.4.0 TM1702 Running Running 56 seconds ago
|
||||
100amjkwzsc6 taos_td-2.1 tdengine/tdengine:2.4.0 TM1703 Running Running about a minute ago
|
||||
pkjehr2vvaaa taos_td-1.1 tdengine/tdengine:2.4.0 TM1704 Running Running 2 minutes ago
|
||||
tpzvgpsr1qkt taos_arbitrator.1 tdengine/tdengine:2.4.0 TM1705 Running Running 2 minutes ago
|
||||
rvss3g5yg6fa taos_adapter.2 tdengine/tdengine:2.4.0 TM1706 Running Running 56 seconds ago
|
||||
i2augxamfllf taos_adapter.3 tdengine/tdengine:2.4.0 TM1707 Running Running 56 seconds ago
|
||||
lmjyhzccpvpg taos_adapter.4 tdengine/tdengine:2.4.0 TM1708 Running Running 56 seconds ago
|
||||
3e94u72msiyg taos_adapter.1 tdengine/tdengine:3.0.0.0 TM1702 Running Running 56 seconds ago
|
||||
100amjkwzsc6 taos_td-2.1 tdengine/tdengine:3.0.0.0 TM1703 Running Running about a minute ago
|
||||
pkjehr2vvaaa taos_td-1.1 tdengine/tdengine:3.0.0.0 TM1704 Running Running 2 minutes ago
|
||||
tpzvgpsr1qkt taos_arbitrator.1 tdengine/tdengine:3.0.0.0 TM1705 Running Running 2 minutes ago
|
||||
rvss3g5yg6fa taos_adapter.2 tdengine/tdengine:3.0.0.0 TM1706 Running Running 56 seconds ago
|
||||
i2augxamfllf taos_adapter.3 tdengine/tdengine:3.0.0.0 TM1707 Running Running 56 seconds ago
|
||||
lmjyhzccpvpg taos_adapter.4 tdengine/tdengine:3.0.0.0 TM1708 Running Running 56 seconds ago
|
||||
$ docker service ls
|
||||
ID NAME MODE REPLICAS IMAGE PORTS
|
||||
561t4lu6nfw6 taos_adapter replicated 4/4 tdengine/tdengine:2.4.0
|
||||
3hk5ct3q90sm taos_arbitrator replicated 1/1 tdengine/tdengine:2.4.0
|
||||
561t4lu6nfw6 taos_adapter replicated 4/4 tdengine/tdengine:3.0.0.0
|
||||
3hk5ct3q90sm taos_arbitrator replicated 1/1 tdengine/tdengine:3.0.0.0
|
||||
d8qr52envqzu taos_nginx replicated 1/1 nginx:latest *:6041->6041/tcp, *:6044->6044/udp
|
||||
2isssfvjk747 taos_td-1 replicated 1/1 tdengine/tdengine:2.4.0
|
||||
9pzw7u02ichv taos_td-2 replicated 1/1 tdengine/tdengine:2.4.0
|
||||
2isssfvjk747 taos_td-1 replicated 1/1 tdengine/tdengine:3.0.0.0
|
||||
9pzw7u02ichv taos_td-2 replicated 1/1 tdengine/tdengine:3.0.0.0
|
||||
```
|
||||
|
||||
<!-- code-spell-checker:enable -->
|
||||
From the above output, you can see two dnodes, two taosAdapters, and one Nginx reverse proxy service.
|
||||
|
||||
It shows that there are two dnodes, one arbitrator, four taosadapter and one nginx reverse-forward service in this cluster.
|
||||
Next, we can reduce the number of taosAdapter services.
|
||||
|
||||
You can scale down the taosadapter replicas to `1` by `docker service`:
|
||||
|
||||
```bash
|
||||
```shell
|
||||
$ docker service scale taos_adapter=1
|
||||
taos_adapter scaled to 1
|
||||
overall progress: 1 out of 1 tasks
|
||||
|
@ -648,17 +503,5 @@ verify: Service converged
|
|||
|
||||
$ docker service ls -f name=taos_adapter
|
||||
ID NAME MODE REPLICAS IMAGE PORTS
|
||||
561t4lu6nfw6 taos_adapter replicated 1/1 tdengine/tdengine:2.4.0
|
||||
561t4lu6nfw6 taos_adapter replicated 1/1 tdengine/tdengine:3.0.0.0
|
||||
```
|
||||
|
||||
Now it remains only 1 taosadapter instance in the cluster.
|
||||
|
||||
When you want to remove the cluster, just type:
|
||||
|
||||
```bash
|
||||
docker stack rm taos
|
||||
```
|
||||
|
||||
### Environment Variables
|
||||
|
||||
When you start `tdengine` image, you can adjust the configuration of TDengine by passing environment variables on the `docker run` command line or in the docker compose file. You can use all of the environment variables that passed to taosd or taosadapter.
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
version: "3"
|
||||
|
||||
networks:
|
||||
inter:
|
||||
api:
|
||||
|
||||
services:
|
||||
arbitrator:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: tarbitrator
|
||||
networks:
|
||||
- inter
|
||||
td-1:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
networks:
|
||||
- inter
|
||||
environment:
|
||||
TAOS_FQDN: "td-1"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td1:/var/lib/taos/
|
||||
- taoslog-td1:/var/log/taos/
|
||||
td-2:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
networks:
|
||||
- inter
|
||||
environment:
|
||||
TAOS_FQDN: "td-2"
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TAOS_NUM_OF_MNODES: "2"
|
||||
TAOS_REPLICA: "2"
|
||||
TAOS_ARBITRATOR: arbitrator:6042
|
||||
volumes:
|
||||
- taosdata-td2:/var/lib/taos/
|
||||
- taoslog-td2:/var/log/taos/
|
||||
adapter:
|
||||
image: tdengine/tdengine:$VERSION
|
||||
command: taosadapter
|
||||
networks:
|
||||
- inter
|
||||
environment:
|
||||
TAOS_FIRST_EP: "td-1"
|
||||
TOAS_SECOND_EP: "td-2"
|
||||
deploy:
|
||||
replicas: 4
|
||||
update_config:
|
||||
parallelism: 4
|
||||
nginx:
|
||||
image: nginx
|
||||
depends_on:
|
||||
- adapter
|
||||
networks:
|
||||
- inter
|
||||
- api
|
||||
ports:
|
||||
- 6041:6041
|
||||
- 6044:6044/udp
|
||||
command: [
|
||||
"sh",
|
||||
"-c",
|
||||
"while true;
|
||||
do curl -s http://adapter:6041/-/ping >/dev/null && break;
|
||||
done;
|
||||
printf 'server{listen 6041;location /{proxy_pass http://adapter:6041;}}'
|
||||
> /etc/nginx/conf.d/rest.conf;
|
||||
printf 'stream{server{listen 6044 udp;proxy_pass adapter:6044;}}'
|
||||
>> /etc/nginx/nginx.conf;cat /etc/nginx/nginx.conf;
|
||||
nginx -g 'daemon off;'",
|
||||
]
|
||||
volumes:
|
||||
taosdata-td1:
|
||||
taoslog-td1:
|
||||
taosdata-td2:
|
||||
taoslog-td2:
|
|
@ -73,7 +73,7 @@ fi
|
|||
|
||||
username="tdengine"
|
||||
|
||||
# generate docker verison
|
||||
# generate docker version
|
||||
echo "generate ${dockerim}:${version}"
|
||||
docker manifest create -a ${dockerim}:${version} ${dockeramd64}:${version} ${dockeraarch64}:${version}
|
||||
docker manifest inspect ${dockerim}:${version}
|
||||
|
|
|
@ -74,7 +74,7 @@ do
|
|||
done
|
||||
|
||||
|
||||
# Check_verison()
|
||||
# Check_version()
|
||||
# {
|
||||
# }
|
||||
|
||||
|
@ -102,14 +102,14 @@ scriptDir=$(dirname $(readlink -f $0))
|
|||
communityDir=${scriptDir}/../../../community
|
||||
DockerfilePath=${communityDir}/packaging/docker/
|
||||
if [ "$cloudBuild" == "y" ]; then
|
||||
comunityArchiveDir=/nas/TDengine/v$version/cloud
|
||||
communityArchiveDir=/nas/TDengine/v$version/cloud
|
||||
Dockerfile=${communityDir}/packaging/docker/DockerfileCloud
|
||||
else
|
||||
comunityArchiveDir=/nas/TDengine/v$version/community
|
||||
communityArchiveDir=/nas/TDengine/v$version/community
|
||||
Dockerfile=${communityDir}/packaging/docker/Dockerfile
|
||||
fi
|
||||
cd ${scriptDir}
|
||||
cp -f ${comunityArchiveDir}/${pkgFile} .
|
||||
cp -f ${communityArchiveDir}/${pkgFile} .
|
||||
|
||||
echo "dirName=${dirName}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue