Skip to content

HDDS-1701. Move dockerbin script to libexec. #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cxorm wants to merge 7 commits into from
Closed

HDDS-1701. Move dockerbin script to libexec. #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b200c42
Rename directory dockerbin to dockerlibexec
cxorm Oct 24, 2019
699b2c1
Relocate the docker scripts in dist
cxorm Oct 24, 2019
75f037b
Append the PATH env-var in docker container
cxorm Oct 25, 2019
dfc4d31
Merge branch 'master' into HDDS-1701
cxorm Nov 4, 2019
493ab3d
Revert "Append the PATH env-var in docker container"
cxorm Nov 4, 2019
8c31256
Append the PATH in Dockerfile
cxorm Nov 4, 2019
4e47650
Update docker.ozone-runner.version
cxorm Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ run cp -f "${ROOT}/hadoop-ozone/dist/src/shell/conf/log4j.properties" "etc/hadoo
run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-default.xml" "etc/hadoop"
run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-nodegroup.xml" "etc/hadoop"

run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerlibexec/." "libexec/"

run cp "${ROOT}/hadoop-ozone/dist/src/shell/ozone/ozone" "bin/"
run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerbin" "bin/docker"


run cp "${ROOT}/hadoop-ozone/dist/src/shell/hdds/hadoop-config.sh" "libexec/"
run cp "${ROOT}/hadoop-ozone/dist/src/shell/hdds/hadoop-config.cmd" "libexec/"
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
<docker.ozone-runner.version>20190717-1</docker.ozone-runner.version>
<docker.ozone-runner.version>20191107-1</docker.ozone-runner.version>
</properties>

<build>
Expand Down
2 changes: 2 additions & 0 deletions hadoop-ozone/dist/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

FROM apache/ozone-runner:@docker.ozone-runner.version@

ENV PATH /opt/hadoop/libexec:${PATH}

ADD --chown=hadoop . /opt/hadoop

WORKDIR /opt/hadoop
0 ...one/dist/src/main/dockerbin/entrypoint.sh → ...dist/src/main/dockerlibexec/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 ...zone/dist/src/main/dockerbin/envtoconf.py → .../dist/src/main/dockerlibexec/envtoconf.py
View file
Open in desktop
File renamed without changes.
0 ...dist/src/main/dockerbin/transformation.py → .../src/main/dockerlibexec/transformation.py
View file
Open in desktop
File renamed without changes.