This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2f4b37b HDDS-1667. Docker compose file may referring to incorrect
docker image name. Contributed by Eric Yang.
2f4b37b is described below
commit 2f4b37b53c9c0c5db22f797be3f0c13318cf3ed2
Author: Márton Elek <[email protected]>
AuthorDate: Mon Jul 1 22:38:19 2019 +0200
HDDS-1667. Docker compose file may referring to incorrect docker image
name. Contributed by Eric Yang.
---
hadoop-ozone/dist/pom.xml | 4 ----
.../network-tests/src/test/compose/docker-compose.yaml | 8 ++++----
hadoop-ozone/pom.xml | 7 +++++++
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 5964bb0..7e43f62 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -28,7 +28,6 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <docker.image>apache/ozone:${project.version}</docker.image>
<docker.hadoop-runner.version>jdk11</docker.hadoop-runner.version>
</properties>
@@ -315,9 +314,6 @@
<profiles>
<profile>
<id>docker-build</id>
- <properties>
- <docker.image>${user.name}/ozone:${project.version}</docker.image>
- </properties>
<build>
<plugins>
<plugin>
diff --git
a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
index 6c8e0fb..7175eb8 100644
---
a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
+++
b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
@@ -17,14 +17,14 @@
version: "3"
services:
datanode:
- image: ${user.name}/ozone:${project.version}
+ image: ${docker.image}
ports:
- 9864
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
- ./docker-config
om:
- image: ${user.name}/ozone:${project.version}
+ image: ${docker.image}
ports:
- 9874:9874
environment:
@@ -33,7 +33,7 @@ services:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
scm:
- image: ${user.name}/ozone:${project.version}
+ image: ${docker.image}
ports:
- 9876:9876
env_file:
@@ -42,7 +42,7 @@ services:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["/opt/hadoop/bin/ozone","scm"]
ozone_client:
- image: ${user.name}/ozone:${project.version}
+ image: ${docker.image}
ports:
- 9869
command: ["tail", "-f","/etc/passwd"]
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 2356276..a9f818b 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -35,6 +35,7 @@
<declared.ozone.version>${ozone.version}</declared.ozone.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<guice.version>4.0</guice.version>
+ <docker.image>apache/ozone:${project.version}</docker.image>
</properties>
<modules>
<module>common</module>
@@ -366,6 +367,12 @@
<profiles>
<profile>
+ <id>docker-build</id>
+ <properties>
+ <docker.image>${user.name}/ozone:${project.version}</docker.image>
+ </properties>
+ </profile>
+ <profile>
<id>parallel-tests</id>
<build>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
