This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_docker_images
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 435b34e9c099e219bebe4d1a145d0de50eda0b82
Author: Xiang Fu <fx19880...@gmail.com>
AuthorDate: Thu Jan 23 01:30:11 2020 -0800
update docker image location
---
docker/images/pinot-presto/README.md | 4 ++--
docker/images/pinot-superset/Makefile | 2 +-
docker/images/pinot-superset/README.md | 2 +-
docker/images/pinot/README.md | 16 ++++++++--------
docker/images/pinot/docker-compose.yml | 6 +++---
kubernetes/helm/README.md | 4 ++--
kubernetes/helm/pinot-realtime-quickstart.yml | 8 ++++----
kubernetes/helm/presto-coordinator.yaml | 2 +-
kubernetes/helm/presto-worker.yaml | 2 +-
kubernetes/helm/values.yaml | 4 ++--
kubernetes/skaffold/gke/pinot-broker.yml | 2 +-
kubernetes/skaffold/gke/pinot-controller.yml | 2 +-
kubernetes/skaffold/gke/pinot-realtime-quickstart.yml | 4 ++--
kubernetes/skaffold/gke/pinot-server.yml | 2 +-
14 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docker/images/pinot-presto/README.md
b/docker/images/pinot-presto/README.md
index 8a39b75..9ac39a0 100644
--- a/docker/images/pinot-presto/README.md
+++ b/docker/images/pinot-presto/README.md
@@ -35,13 +35,13 @@ You can also build directly with `docker build` command by
setting arguments:
```bash
docker build \
--build-arg PRESTO_BRANCH=master \
- --tag fx19880617/pinot-presto:0.1 \
+ --tag apachepinot/pinot-presto:latest \
--target build .
```
## How to push
```bash
-docker push fx19880617/pinot-presto:0.1
+docker push apachepinot/pinot-presto:latest
```
## Configuration
diff --git a/docker/images/pinot-superset/Makefile
b/docker/images/pinot-superset/Makefile
index 85fb778..5a4ef94 100644
--- a/docker/images/pinot-superset/Makefile
+++ b/docker/images/pinot-superset/Makefile
@@ -17,7 +17,7 @@
# under the License.
#
-image := fx19880617/pinot-superset
+image := apachepinot/pinot-superset
stages := build dist final
shells := $(foreach stage,$(stages),shell@$(stage))
diff --git a/docker/images/pinot-superset/README.md
b/docker/images/pinot-superset/README.md
index 8e35f3b..fedbf61 100644
--- a/docker/images/pinot-superset/README.md
+++ b/docker/images/pinot-superset/README.md
@@ -41,7 +41,7 @@ docker build \
--build-arg NODE_VERSION=latest \
--build-arg PYTHON_VERSION=3.6 \
--build-arg SUPERSET_VERSION=0.34.1 \
- --tag fx19880617/pinot-superset:0.34.1 \
+ --tag apachepinot/pinot-superset:0.34.1 \
--target build .
```
## How to push
diff --git a/docker/images/pinot/README.md b/docker/images/pinot/README.md
index f18aa79..c7cfdc9 100644
--- a/docker/images/pinot/README.md
+++ b/docker/images/pinot/README.md
@@ -58,24 +58,24 @@ Script `docker-push.sh` publishes a given docker image to
your docker registry.
In order to push to your own repo, the image needs to be explicitly tagged
with the repo name.
-* Example of publishing a image to
[winedepot/pinot](https://cloud.docker.com/u/winedepot/repository/docker/winedepot/pinot)
dockerHub repo.
+* Example of publishing a image to
[apachepinot/pinot](https://cloud.docker.com/u/apachepinot/repository/docker/apachepinot/pinot)
dockerHub repo.
```SHELL
-./docker-push.sh winedepot/pinot:latest
+./docker-push.sh apachepinot/pinot:latest
```
* Tag a built image, then push.
````SHELL
-docker tag pinot:release-0.1.0 winedepot/pinot:release-0.1.0
-docker push winedepot/pinot:release-0.1.0
+docker tag pinot:release-0.1.0 apachepinot/pinot:release-0.1.0
+docker push apachepinot/pinot:release-0.1.0
````
Script `docker-build-and-push.sh` builds and publishes this docker image to
your docker registry after build.
-* Example of building and publishing a image to
[winedepot/pinot](https://cloud.docker.com/u/winedepot/repository/docker/winedepot/pinot)
dockerHub repo.
+* Example of building and publishing a image to
[apachepinot/pinot](https://cloud.docker.com/u/apachepinot/repository/docker/apachepinot/pinot)
dockerHub repo.
```SHELL
-./docker-build-and-push.sh winedepot/pinot:latest master
https://github.com/apache/incubator-pinot.git
+./docker-build-and-push.sh apachepinot/pinot:latest master
https://github.com/apache/incubator-pinot.git
```
## How to Run it
@@ -131,12 +131,12 @@ docker-compose -f docker-compose.yml up
Below is the script to create airlineStats table
```SHELL
-docker run --network=docker_default winedepot/pinot:0.3.0-SNAPSHOT AddTable
-schemaFile examples/stream/airlineStats/airlineStats_schema.json
-tableConfigFile
examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
-controllerHost pinot-controller -controllerPort 9000 -exec
+docker run --network=docker_default apachepinot/pinot:0.3.0-SNAPSHOT AddTable
-schemaFile examples/stream/airlineStats/airlineStats_schema.json
-tableConfigFile
examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
-controllerHost pinot-controller -controllerPort 9000 -exec
```
Below is the script to ingest airplane stats data to Kafka
```SHELL
-docker run --network=docker_default winedepot/pinot:0.3.0-SNAPSHOT
StreamAvroIntoKafka -avroFile
examples/stream/airlineStats/sample_data/airlineStats_data.avro -kafkaTopic
flights-realtime -kafkaBrokerList kafka:9092 -zkAddress zookeeper:2181
+docker run --network=docker_default apachepinot/pinot:0.3.0-SNAPSHOT
StreamAvroIntoKafka -avroFile
examples/stream/airlineStats/sample_data/airlineStats_data.avro -kafkaTopic
flights-realtime -kafkaBrokerList kafka:9092 -zkAddress zookeeper:2181
```
In order to query pinot, try to open `localhost:9000/query` from your browser.
diff --git a/docker/images/pinot/docker-compose.yml
b/docker/images/pinot/docker-compose.yml
index e7be2ee..51af5ae 100644
--- a/docker/images/pinot/docker-compose.yml
+++ b/docker/images/pinot/docker-compose.yml
@@ -49,7 +49,7 @@ services:
depends_on:
- zookeeper
pinot-controller:
- image: winedepot/pinot:kafka2
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
hostname: pinot-controller
volumes:
- ./pinot-docker-demo/pinot/controller:/tmp/data/controller
@@ -59,7 +59,7 @@ services:
depends_on:
- kafka
pinot-broker:
- image: winedepot/pinot:kafka2
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
hostname: pinot-broker
ports:
- "8099:8099"
@@ -69,7 +69,7 @@ services:
- kafka
- pinot-controller
pinot-server:
- image: winedepot/pinot:kafka2
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
hostname: pinot-server
volumes:
- ./pinot-docker-demo/pinot/server:/tmp/data/server
diff --git a/kubernetes/helm/README.md b/kubernetes/helm/README.md
index 3816ae2..9a6a695 100644
--- a/kubernetes/helm/README.md
+++ b/kubernetes/helm/README.md
@@ -284,8 +284,8 @@ following configurable parameters:
| Parameter | Description
| Default
|
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
-| `image.repository` | Pinot Container image repo
|
`winedepot/pinot` |
-| `image.tag` | Pinot Container image tag
|
`0.1.13-SNAPSHOT` |
+| `image.repository` | Pinot Container image repo
|
`apachepinot/pinot` |
+| `image.tag` | Pinot Container image tag
|
`0.3.0-SNAPSHOT` |
| `image.pullPolicy` | Pinot Container image pull
policy
|
`IfNotPresent` |
| `cluster.name` | Pinot Cluster name
|
`pinot-quickstart` |
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
diff --git a/kubernetes/helm/pinot-realtime-quickstart.yml
b/kubernetes/helm/pinot-realtime-quickstart.yml
index e5a613a..52e7ae3 100644
--- a/kubernetes/helm/pinot-realtime-quickstart.yml
+++ b/kubernetes/helm/pinot-realtime-quickstart.yml
@@ -462,7 +462,7 @@ spec:
spec:
containers:
- name: pinot-add-example-realtime-table-json
- image: fx19880617/pinot:0.3.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "AddTable", "-schemaFile",
"/var/pinot/examples/airlineStats_schema.json", "-tableConfigFile",
"/var/pinot/examples/airlineStats_realtime_table_config.json",
"-controllerHost", "pinot-controller", "-controllerPort", "9000", "-exec" ]
env:
- name: JAVA_OPTS
@@ -471,7 +471,7 @@ spec:
- name: examples
mountPath: /var/pinot/examples
- name: pinot-add-example-realtime-table-avro
- image: fx19880617/pinot:0.3.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "AddTable", "-schemaFile",
"/var/pinot/examples/airlineStats_schema.json", "-tableConfigFile",
"/var/pinot/examples/airlineStatsAvro_realtime_table_config.json",
"-controllerHost", "pinot-controller", "-controllerPort", "9000", "-exec" ]
env:
- name: JAVA_OPTS
@@ -496,10 +496,10 @@ spec:
spec:
containers:
- name: loading-json-data-to-kafka
- image: fx19880617/pinot:0.2.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "StreamAvroIntoKafka", "-avroFile",
"examples/stream/airlineStats/sample_data/airlineStats_data.avro",
"-kafkaTopic", "flights-realtime", "-kafkaBrokerList", "kafka:9092",
"-zkAddress", "kafka-zookeeper:2181" ]
- name: loading-avro-data-to-kafka
- image: fx19880617/pinot:0.2.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "StreamAvroIntoKafka", "-avroFile",
"examples/stream/airlineStats/sample_data/airlineStats_data.avro",
"-kafkaTopic", "flights-realtime-avro", "-kafkaBrokerList", "kafka:9092",
"-zkAddress", "kafka-zookeeper:2181", "-outputFormat", "avro" ]
restartPolicy: OnFailure
backoffLimit: 3
diff --git a/kubernetes/helm/presto-coordinator.yaml
b/kubernetes/helm/presto-coordinator.yaml
index f387b85..f9cc82f 100644
--- a/kubernetes/helm/presto-coordinator.yaml
+++ b/kubernetes/helm/presto-coordinator.yaml
@@ -88,7 +88,7 @@ spec:
runAsGroup: 1000
fsGroup: 1000
containers:
- - image: fx19880617/pinot-presto:latest
+ - image: apachepinot/pinot-presto:latest
imagePullPolicy: Always
name: presto-coordinator
args: [ "run" ]
diff --git a/kubernetes/helm/presto-worker.yaml
b/kubernetes/helm/presto-worker.yaml
index 454e23b..b89a649 100644
--- a/kubernetes/helm/presto-worker.yaml
+++ b/kubernetes/helm/presto-worker.yaml
@@ -74,7 +74,7 @@ spec:
fsGroup: 1000
runAsUser: 1000
containers:
- - image: fx19880617/pinot-presto:latest
+ - image: apachepinot/pinot-presto:latest
imagePullPolicy: Always
name: presto-worker
args: [ "run" ]
diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml
index 022a2b9..bcf593c 100644
--- a/kubernetes/helm/values.yaml
+++ b/kubernetes/helm/values.yaml
@@ -20,8 +20,8 @@
# Default values for Pinot.
image:
- repository: winedepot/pinot
- tag: 0.1.13-SNAPSHOT
+ repository: apachepinot/pinot
+ tag: 0.3.0-SNAPSHOT
pullPolicy: IfNotPresent
cluster:
diff --git a/kubernetes/skaffold/gke/pinot-broker.yml
b/kubernetes/skaffold/gke/pinot-broker.yml
index 99d865e..f430dd9 100644
--- a/kubernetes/skaffold/gke/pinot-broker.yml
+++ b/kubernetes/skaffold/gke/pinot-broker.yml
@@ -52,7 +52,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:0.1.13-SNAPSHOT
+ - image: apachepinot/pinot:0.3.0-SNAPSHOT
imagePullPolicy: Always
name: pinot-broker
args: [
diff --git a/kubernetes/skaffold/gke/pinot-controller.yml
b/kubernetes/skaffold/gke/pinot-controller.yml
index 4cd4f25..5d126eb 100644
--- a/kubernetes/skaffold/gke/pinot-controller.yml
+++ b/kubernetes/skaffold/gke/pinot-controller.yml
@@ -55,7 +55,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:0.1.13-SNAPSHOT
+ - image: apachepinot/pinot:0.3.0-SNAPSHOT
imagePullPolicy: Always
name: pinot-controller
args: [
diff --git a/kubernetes/skaffold/gke/pinot-realtime-quickstart.yml
b/kubernetes/skaffold/gke/pinot-realtime-quickstart.yml
index cd39c22..a34e9b5 100644
--- a/kubernetes/skaffold/gke/pinot-realtime-quickstart.yml
+++ b/kubernetes/skaffold/gke/pinot-realtime-quickstart.yml
@@ -27,10 +27,10 @@ spec:
spec:
containers:
- name: loading-data-to-kafka
- image: winedepot/pinot:0.3.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "StreamAvroIntoKafka", "-avroFile",
"examples/stream/airlineStats/sample_data/airlineStats_data.avro",
"-kafkaTopic", "flights-realtime", "-kafkaBrokerList", "kafka:9092",
"-zkAddress", "zookeeper:2181" ]
- name: pinot-add-example-realtime-table
- image: winedepot/pinot:0.3.0-SNAPSHOT
+ image: apachepinot/pinot:0.3.0-SNAPSHOT
args: [ "AddTable", "-schemaFile",
"examples/stream/airlineStats/airlineStats_schema.json", "-tableConfigFile",
"examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json",
"-controllerHost", "pinot-controller", "-controllerPort", "9000", "-exec" ]
restartPolicy: OnFailure
nodeSelector:
diff --git a/kubernetes/skaffold/gke/pinot-server.yml
b/kubernetes/skaffold/gke/pinot-server.yml
index c285603..f3d9227 100644
--- a/kubernetes/skaffold/gke/pinot-server.yml
+++ b/kubernetes/skaffold/gke/pinot-server.yml
@@ -53,7 +53,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:0.1.13-SNAPSHOT
+ - image: apachepinot/pinot:0.3.0-SNAPSHOT
imagePullPolicy: Always
name: pinot-server
args: [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
