This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new a05b90de09 [MINOR UPDATE] Update Docker-Compose Docs (#2933)
a05b90de09 is described below
commit a05b90de09599b5139340c9913da4d971ff25902
Author: PJ Fanning <pjfann...@users.noreply.github.com>
AuthorDate: Wed Aug 7 15:15:05 2024 +0100
[MINOR UPDATE] Update Docker-Compose Docs (#2933)
---
contrib/storage-druid/README.md | 12 ++++++------
.../src/test/resources/druid/docker-compose.yaml | 2 --
distribution/docker-compose/README.txt | 6 +++---
distribution/docker-compose/docker-compose.yml | 1 -
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/contrib/storage-druid/README.md b/contrib/storage-druid/README.md
index 479024aa06..beeddc39e6 100644
--- a/contrib/storage-druid/README.md
+++ b/contrib/storage-druid/README.md
@@ -33,27 +33,27 @@ Following is the default registration configuration.
### Druid storage plugin developer notes.
-* Building the plugin
+* Building the plugin
`mvn install -pl contrib/storage-druid`
* Building DRILL
`mvn clean install -DskipTests`
-
+
* Start Drill In Embedded Mode (mac)
```shell script
distribution/target/apache-drill-1.20.0-SNAPSHOT/apache-drill-1.20.0-SNAPSHOT/bin/drill-embedded
```
-
+
* Starting Druid (Docker and Docker Compose required)
```
cd contrib/storage-druid/src/test/resources/druid
- docker-compose up -d
+ docker compose up -d
```
-
+
* There is an `Indexing Task Json` in the same folder as the docker compose
file. It can be used to ingest the wikipedia datasource.
-
+
* Make sure the druid storage plugin is enabled in Drill.
diff --git a/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
b/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
index 700e9704dd..5ff1400ecf 100644
--- a/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
+++ b/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
@@ -16,8 +16,6 @@
# limitations under the License.
#
-version: "2.2"
-
volumes:
metadata_data: {}
middle_var: {}
diff --git a/distribution/docker-compose/README.txt
b/distribution/docker-compose/README.txt
index bd8bb6d040..da98882003 100644
--- a/distribution/docker-compose/README.txt
+++ b/distribution/docker-compose/README.txt
@@ -6,7 +6,7 @@ launch. Logging is redirected to stdout.
In the docker-cluster-mode directory:
1. docker build -t apache/drill-cluster-mode
-2. docker-compose up
+2. docker compose up
Then access the web UI at http://localhost:8047 or connect a JDBC client to
jdbc:drill:drillbit=localhost or jdbc:drill:zk=localhost but note that you
@@ -15,11 +15,11 @@ to use a ZooKeeper JDBC URL.
To launch a cluster of 3 Drillbits
-3. docker-compose up --scale drillbit=3
+3. docker compose up --scale drillbit=3
but first note that to use docker-compose's "scale" feature to run multiple
Drillbit containers on a single host you will need to remove the host port
mappings from the compose file to prevent collisions (see the comments
on the relevant lines in that file). Once the Drillbits are launched run
-`docker-compose ps` to list the ephemeral ports that have been allocated on
+`docker compose ps` to list the ephemeral ports that have been allocated on
the host.
diff --git a/distribution/docker-compose/docker-compose.yml
b/distribution/docker-compose/docker-compose.yml
index d43bfa9e6f..4fcf805323 100644
--- a/distribution/docker-compose/docker-compose.yml
+++ b/distribution/docker-compose/docker-compose.yml
@@ -16,7 +16,6 @@
# limitations under the License.
#
-version: "3.9"
services:
zookeeper:
container_name: zookeeper
