HDDS-1667. Docker compose file may referring to incorrect docker image name. Contributed by Eric Yang.

This commit is contained in:
Márton Elek 2019-07-01 22:38:19 +02:00
parent d8bac50e12
commit 2f4b37b53c
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28
3 changed files with 11 additions and 8 deletions

View File

@ -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>

View File

@ -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"]

View File

@ -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>
@ -365,6 +366,12 @@
</build>
<profiles>
<profile>
<id>docker-build</id>
<properties>
<docker.image>${user.name}/ozone:${project.version}</docker.image>
</properties>
</profile>
<profile>
<id>parallel-tests</id>
<build>