From 454350649ab2826aae436bb8d4ed0ec1174301b3 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 10 Nov 2019 14:43:49 +0100 Subject: [PATCH 1/3] HDDS-2456. Add explicit base image version for images derived from ozone-runner --- .../src/main/compose/ozone-om-ha/Dockerfile | 4 ++- .../compose/ozone-om-ha/docker-compose.yaml | 25 +++++++++++++++---- .../src/main/compose/ozonescripts/Dockerfile | 6 ++++- .../compose/ozonescripts/docker-compose.yaml | 15 ++++++++--- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile index 861b4699ed0b..1f9da067f2cd 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile @@ -14,7 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM apache/ozone-runner +ARG OZONE_RUNNER_VERSION + +FROM apache/ozone-runner:${OZONE_RUNNER_VERSION} # Install ssh RUN sudo yum install -y openssh-clients openssh-server diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml index 1718430662c8..4e6466388c44 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml @@ -17,7 +17,10 @@ version: "3" services: datanode: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -27,7 +30,10 @@ services: env_file: - ./docker-config om1: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -40,7 +46,10 @@ services: - ./docker-config command: sleep 1d om2: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -53,7 +62,10 @@ services: - ./docker-config command: sleep 1d om3: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -66,7 +78,10 @@ services: - ./docker-config command: sleep 1d scm: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION privileged: true #required by the profiler volumes: - ../..:/opt/hadoop diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile index b07800053b2a..da2adab9f8de 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile @@ -13,7 +13,11 @@ # 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 apache/ozone-runner + +ARG OZONE_RUNNER_VERSION + +FROM apache/ozone-runner:${OZONE_RUNNER_VERSION} + RUN sudo yum install -y openssh-clients openssh-server RUN sudo ssh-keygen -A diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml index 62f116368f4b..7ea012362511 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml @@ -17,7 +17,10 @@ version: "3" services: datanode: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION volumes: - ../..:/opt/hadoop ports: @@ -25,7 +28,10 @@ services: env_file: - ./docker-config om: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION volumes: - ../..:/opt/hadoop ports: @@ -33,7 +39,10 @@ services: env_file: - ./docker-config scm: - build: . + build: + context: . + args: + - OZONE_RUNNER_VERSION volumes: - ../..:/opt/hadoop ports: From fa9467e6fc59bd2bca5dbcdb61e8b6c28d1ce075 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 10 Nov 2019 14:46:33 +0100 Subject: [PATCH 2/3] HDDS-2456. Fix typo in README --- hadoop-ozone/dist/src/main/compose/ozonescripts/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md b/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md index 2531fa43660f..e191825f6338 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md @@ -22,10 +22,10 @@ similar to a real cluster. To use it, first start the cluster: ``` -docker-copmose up -d +docker-compose up -d ``` -After a successfull startup (which starts only the ssh daemons) you can start ozone: +After a successful startup (which starts only the ssh daemons) you can start ozone: ``` ./start.sh @@ -35,4 +35,4 @@ Check it the java processes are started: ``` ./ps.sh -``` \ No newline at end of file +``` From 67a04b62779179d19d9743d6213ac43ffcb81a6b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 10 Nov 2019 15:18:17 +0100 Subject: [PATCH 3/3] HDDS-2456. Tag images created with specific version --- .../dist/src/main/compose/ozone-om-ha/docker-compose.yaml | 5 +++++ .../dist/src/main/compose/ozonescripts/docker-compose.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml index 4e6466388c44..8bb640957edb 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml @@ -21,6 +21,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -34,6 +35,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -50,6 +52,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -66,6 +69,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler volumes: - ../..:/opt/hadoop @@ -82,6 +86,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION} privileged: true #required by the profiler volumes: - ../..:/opt/hadoop diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml index 7ea012362511..e19dd235c8ff 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml @@ -21,6 +21,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-scripts:${OZONE_RUNNER_VERSION} volumes: - ../..:/opt/hadoop ports: @@ -32,6 +33,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-scripts:${OZONE_RUNNER_VERSION} volumes: - ../..:/opt/hadoop ports: @@ -43,6 +45,7 @@ services: context: . args: - OZONE_RUNNER_VERSION + image: ozone-runner-scripts:${OZONE_RUNNER_VERSION} volumes: - ../..:/opt/hadoop ports: