This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 9c54e73 Docker image for integration testing (#1275)
9c54e73 is described below
commit 9c54e73247cdc9cb33b2fe77287a377798f6b7c7
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Wed Feb 28 18:10:56 2018 +0100
Docker image for integration testing (#1275)
* Docker image for integration testing
A docker image built with the pulsar distribution tarball. The same
image can be used to run zookeeper, bookkeeper, the broker or a
proxy. Scripts are provided to run each. There is also a script to
initialize the cluster.
All services are run with supervisor, so that tests will be able to
start and stop the services.
* Fix build
---
docker/pom.xml | 1 -
pom.xml | 6 ++
.../docker-images/latest-version-image/Dockerfile | 39 ++++++++++
.../latest-version-image/conf/bookie.conf | 26 +++++++
.../latest-version-image/conf/broker.conf | 26 +++++++
.../latest-version-image/conf/global-zk.conf | 26 +++++++
.../latest-version-image/conf/local-zk.conf | 26 +++++++
.../latest-version-image/conf/proxy.conf | 26 +++++++
.../latest-version-image/conf/supervisord.conf | 40 ++++++++++
tests/docker-images/latest-version-image/pom.xml | 85 ++++++++++++++++++++++
.../latest-version-image/scripts/init-cluster.sh | 36 +++++++++
.../latest-version-image/scripts/run-bookie.sh | 30 ++++++++
.../latest-version-image/scripts/run-broker.sh | 30 ++++++++
.../latest-version-image/scripts/run-global-zk.sh | 29 ++++++++
.../latest-version-image/scripts/run-local-zk.sh | 29 ++++++++
.../latest-version-image/scripts/run-proxy.sh | 30 ++++++++
{docker => tests/docker-images}/pom.xml | 15 ++--
{docker => tests}/pom.xml | 24 +++---
18 files changed, 504 insertions(+), 20 deletions(-)
diff --git a/docker/pom.xml b/docker/pom.xml
index 2693bf7..ec4f8ca 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -32,7 +32,6 @@
<artifactId>docker-images</artifactId>
<name>Apache Pulsar :: Docker Images</name>
<properties>
- <dockerfile-maven.version>1.3.7</dockerfile-maven.version>
<docker.organization>apachepulsar</docker.organization>
</properties>
<modules>
diff --git a/pom.xml b/pom.xml
index 57222c6..c3b1406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,8 @@ flexible messaging model and an intuitive client
API.</description>
<module>pulsar-client-kafka-compat</module>
<module>pulsar-zookeeper</module>
<module>all</module>
+ <module>docker</module>
+ <module>tests</module>
</modules>
<issueManagement>
@@ -123,6 +125,7 @@ flexible messaging model and an intuitive client
API.</description>
<bouncycastle.version>1.55</bouncycastle.version>
<jackson.version>2.8.4</jackson.version>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
+ <dockerfile-maven.version>1.3.7</dockerfile-maven.version>
</properties>
<dependencyManagement>
@@ -982,6 +985,9 @@ flexible messaging model and an intuitive client
API.</description>
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>docker</id>
+ </profile>
</profiles>
<repositories>
diff --git a/tests/docker-images/latest-version-image/Dockerfile
b/tests/docker-images/latest-version-image/Dockerfile
new file mode 100644
index 0000000..e15c289
--- /dev/null
+++ b/tests/docker-images/latest-version-image/Dockerfile
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+FROM apachepulsar/pulsar:latest
+
+RUN apt-get update && apt-get install -y supervisor
+
+RUN mkdir -p /var/log/pulsar && mkdir -p /var/run/supervisor/
+
+COPY conf/supervisord.conf /etc/supervisord.conf
+COPY conf/global-zk.conf /etc/supervisord/conf.d/global-zk.conf
+COPY conf/local-zk.conf /etc/supervisord/conf.d/local-zk.conf
+COPY conf/bookie.conf /etc/supervisord/conf.d/bookie.conf
+COPY conf/broker.conf /etc/supervisord/conf.d/broker.conf
+COPY conf/proxy.conf /etc/supervisord/conf.d/proxy.conf
+
+COPY scripts/init-cluster.sh /pulsar/bin
+COPY scripts/run-global-zk.sh /pulsar/bin
+COPY scripts/run-local-zk.sh /pulsar/bin
+COPY scripts/run-bookie.sh /pulsar/bin
+COPY scripts/run-broker.sh /pulsar/bin
+COPY scripts/run-proxy.sh /pulsar/bin
+
diff --git a/tests/docker-images/latest-version-image/conf/bookie.conf
b/tests/docker-images/latest-version-image/conf/bookie.conf
new file mode 100644
index 0000000..53fd06e
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/bookie.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[program:bookie]
+autostart=false
+redirect_stderr=true
+stdout_logfile=/var/log/pulsar/bookie.log
+directory=/pulsar
+command=/pulsar/bin/pulsar bookie
+
diff --git a/tests/docker-images/latest-version-image/conf/broker.conf
b/tests/docker-images/latest-version-image/conf/broker.conf
new file mode 100644
index 0000000..ca8843f
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/broker.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[program:broker]
+autostart=false
+redirect_stderr=true
+stdout_logfile=/var/log/pulsar/broker.log
+directory=/pulsar
+command=/pulsar/bin/pulsar broker
+
diff --git a/tests/docker-images/latest-version-image/conf/global-zk.conf
b/tests/docker-images/latest-version-image/conf/global-zk.conf
new file mode 100644
index 0000000..f589ade
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/global-zk.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[program:global-zk]
+autostart=false
+redirect_stderr=true
+stdout_logfile=/var/log/pulsar/global-zk.log
+directory=/pulsar
+command=/pulsar/bin/pulsar global-zookeeper
+
diff --git a/tests/docker-images/latest-version-image/conf/local-zk.conf
b/tests/docker-images/latest-version-image/conf/local-zk.conf
new file mode 100644
index 0000000..f5daba0
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/local-zk.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[program:local-zk]
+autostart=false
+redirect_stderr=true
+stdout_logfile=/var/log/pulsar/local-zk.log
+directory=/pulsar
+command=/pulsar/bin/pulsar zookeeper
+
diff --git a/tests/docker-images/latest-version-image/conf/proxy.conf
b/tests/docker-images/latest-version-image/conf/proxy.conf
new file mode 100644
index 0000000..7ab7e8f
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/proxy.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[program:proxy]
+autostart=false
+redirect_stderr=true
+stdout_logfile=/var/log/pulsar/proxy.log
+directory=/pulsar
+command=/pulsar/bin/pulsar proxy
+
diff --git a/tests/docker-images/latest-version-image/conf/supervisord.conf
b/tests/docker-images/latest-version-image/conf/supervisord.conf
new file mode 100644
index 0000000..ee48be3
--- /dev/null
+++ b/tests/docker-images/latest-version-image/conf/supervisord.conf
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+pidfile=/var/run/supervisord.pid
+minfds=1024
+minprocs=200
+
+[unix_http_server]
+file=/var/run/supervisor/supervisor.sock
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory =
supervisor.rpcinterface:make_main_rpcinterface
+
+[include]
+files = /etc/supervisord/conf.d/*.conf
diff --git a/tests/docker-images/latest-version-image/pom.xml
b/tests/docker-images/latest-version-image/pom.xml
new file mode 100644
index 0000000..9acad9e
--- /dev/null
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -0,0 +1,85 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <groupId>org.apache.pulsar.tests</groupId>
+ <artifactId>docker-images</artifactId>
+ <version>2.0.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.pulsar.tests</groupId>
+ <artifactId>latest-version-image</artifactId>
+ <name>Apache Pulsar :: Tests :: Docker Images :: Latest Version
Testing</name>
+ <packaging>pom</packaging>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <property>
+ <name>integrationTests</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-docker-image</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>docker-info</classifier>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${dockerfile-maven.version}</version>
+ <executions>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>add-latest-tag</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+
<repository>apachepulsar/pulsar-test-latest-version</repository>
+ <tag>latest</tag>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>apachepulsar/pulsar-test-latest-version</repository>
+ <tag>${project.version}</tag>
+ <pullNewerImage>false</pullNewerImage>
+ <noCache>true</noCache>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/tests/docker-images/latest-version-image/scripts/init-cluster.sh
b/tests/docker-images/latest-version-image/scripts/init-cluster.sh
new file mode 100755
index 0000000..e4403b3
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/init-cluster.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+ZNODE="/initialized"
+
+bin/watch-znode.py -z $zkServers -p / -w
+
+bin/watch-znode.py -z $zkServers -p $ZNODE -e
+if [ $? != 0 ]; then
+ echo Initializing cluster
+ bin/apply-config-from-env.py conf/bookkeeper.conf &&
+ bin/pulsar initialize-cluster-metadata --cluster $cluster --zookeeper
$zkServers \
+ --global-zookeeper $globalZkServers --web-service-url
http://$pulsarNode:8080/ \
+ --broker-service-url http://$pulsarNode:6650/ &&
+ bin/watch-znode.py -z $zkServers -p $ZNODE -c
+ echo Initialized
+else
+ echo Already Initialized
+fi
diff --git a/tests/docker-images/latest-version-image/scripts/run-bookie.sh
b/tests/docker-images/latest-version-image/scripts/run-bookie.sh
new file mode 100755
index 0000000..adaaced
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/run-bookie.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bin/apply-config-from-env.py conf/bookkeeper.conf && \
+ bin/apply-config-from-env.py conf/pulsar_env.sh
+
+if [ -z "$NO_AUTOSTART" ]; then
+ sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/bookie.conf
+fi
+
+bin/watch-znode.py -z $zkServers -p /initialized -w
+exec /usr/bin/supervisord -c /etc/supervisord.conf
+
diff --git a/tests/docker-images/latest-version-image/scripts/run-broker.sh
b/tests/docker-images/latest-version-image/scripts/run-broker.sh
new file mode 100755
index 0000000..cef8b65
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/run-broker.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bin/apply-config-from-env.py conf/broker.conf && \
+ bin/apply-config-from-env.py conf/pulsar_env.sh
+
+if [ -z "$NO_AUTOSTART" ]; then
+ sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/broker.conf
+fi
+
+bin/watch-znode.py -z $zookeeperServers -p /initialized -w
+exec /usr/bin/supervisord -c /etc/supervisord.conf
+
diff --git a/tests/docker-images/latest-version-image/scripts/run-global-zk.sh
b/tests/docker-images/latest-version-image/scripts/run-global-zk.sh
new file mode 100755
index 0000000..783ef2d
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/run-global-zk.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bin/apply-config-from-env.py conf/zookeeper.conf && \
+ bin/apply-config-from-env.py conf/pulsar_env.sh && \
+ bin/generate-zookeeper-config.sh conf/global_zookeeper.conf
+
+if [ -z "$NO_AUTOSTART" ]; then
+ sed -i 's/autostart=.*/autostart=true/'
/etc/supervisord/conf.d/global-zk.conf
+fi
+
+exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/tests/docker-images/latest-version-image/scripts/run-local-zk.sh
b/tests/docker-images/latest-version-image/scripts/run-local-zk.sh
new file mode 100755
index 0000000..b27212b
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/run-local-zk.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bin/apply-config-from-env.py conf/zookeeper.conf && \
+ bin/apply-config-from-env.py conf/pulsar_env.sh && \
+ bin/generate-zookeeper-config.sh conf/zookeeper.conf
+
+if [ -z "$NO_AUTOSTART" ]; then
+ sed -i 's/autostart=.*/autostart=true/'
/etc/supervisord/conf.d/local-zk.conf
+fi
+
+exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/tests/docker-images/latest-version-image/scripts/run-proxy.sh
b/tests/docker-images/latest-version-image/scripts/run-proxy.sh
new file mode 100755
index 0000000..05b38b0
--- /dev/null
+++ b/tests/docker-images/latest-version-image/scripts/run-proxy.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bin/apply-config-from-env.py conf/proxy.conf && \
+ bin/apply-config-from-env.py conf/pulsar_env.sh
+
+if [ -z "$NO_AUTOSTART" ]; then
+ sed -i 's/autostart=.*/autostart=true/' /etc/supervisord/conf.d/proxy.conf
+fi
+
+bin/watch-znode.py -z $zookeeperServers -p /initialized -w
+exec /usr/bin/supervisord -c /etc/supervisord.conf
+
diff --git a/docker/pom.xml b/tests/docker-images/pom.xml
similarity index 77%
copy from docker/pom.xml
copy to tests/docker-images/pom.xml
index 2693bf7..9fbbc2d 100644
--- a/docker/pom.xml
+++ b/tests/docker-images/pom.xml
@@ -24,19 +24,14 @@
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar</artifactId>
+ <groupId>org.apache.pulsar.tests</groupId>
+ <artifactId>tests-parent</artifactId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.pulsar</groupId>
+ <groupId>org.apache.pulsar.tests</groupId>
<artifactId>docker-images</artifactId>
- <name>Apache Pulsar :: Docker Images</name>
- <properties>
- <dockerfile-maven.version>1.3.7</dockerfile-maven.version>
- <docker.organization>apachepulsar</docker.organization>
- </properties>
+ <name>Apache Pulsar :: Tests :: Docker Images</name>
<modules>
- <module>pulsar</module>
- <module>grafana</module>
+ <module>latest-version-image</module>
</modules>
</project>
diff --git a/docker/pom.xml b/tests/pom.xml
similarity index 75%
copy from docker/pom.xml
copy to tests/pom.xml
index 2693bf7..ea6f20b 100644
--- a/docker/pom.xml
+++ b/tests/pom.xml
@@ -28,15 +28,21 @@
<artifactId>pulsar</artifactId>
<version>2.0.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>docker-images</artifactId>
- <name>Apache Pulsar :: Docker Images</name>
- <properties>
- <dockerfile-maven.version>1.3.7</dockerfile-maven.version>
- <docker.organization>apachepulsar</docker.organization>
- </properties>
+ <groupId>org.apache.pulsar.tests</groupId>
+ <artifactId>tests-parent</artifactId>
+ <name>Apache Pulsar :: Tests</name>
<modules>
- <module>pulsar</module>
- <module>grafana</module>
+ <module>docker-images</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
--
To stop receiving notification emails like this one, please contact
mme...@apache.org.
