Skip to content
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.

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

NIFI-7080 Ensure script files in Docker builds are treated as executable. #4027

Closed
wants to merge 1 commit into from

Conversation

apiri
Copy link
Member

@apiri apiri commented Jan 30, 2020

  • Ensure script files in Docker builds are treated as executable.
  • Updating git permissions to reflect executable for both secure.sh scripts.

Signed-off-by: Aldrin Piri aldrin@apache.org

Thank you for submitting a contribution to Apache NiFi.

Please provide a short description of the PR here:

Description of PR

Enables X functionality; fixes bug NIFI-YYYY.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically master)?

  • Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • Have you verified that the full build is successful on both JDK 8 and JDK 11?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.

* Ensure script files in Docker builds are treated as executable.
* Updating git permissions to reflect executable for both secure.sh scripts.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
@apiri
Copy link
Member Author

apiri commented Jan 30, 2020

The best way I found to verify is to strip the executable perm from all script files from the source root
via:
find ./nifi-docker -type f -iname '*.sh' -exec chmod -x {} \;
and then performing the image generation via:
mvn package -DskipTests -Pdocker

@kevdoran
Copy link
Contributor

Thanks @apiri! reviewing...

Copy link
Contributor

@kevdoran kevdoran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the helpful instructions, @apiri. This indeed looks like it will fix the issues I was experiencing for the v1.11.0 RC due to the permissions being lost by the zip creation. Looks like a nice robust way to prevent that in the future, regardless of the source file permissions.

+1, will merge.

@kevdoran kevdoran closed this in c8af8ea Jan 31, 2020
kevdoran pushed a commit that referenced this pull request Jan 31, 2020
* Ensure script files in Docker builds are treated as executable.
* Updating git permissions to reflect executable for both secure.sh scripts.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
Signed-off-by: Kevin Doran <kdoran@apache.org>

This closes #4027.

Signed-off-by: Kevin Doran <kdoran@apache.org>
natural pushed a commit to natural/nifi that referenced this pull request Feb 1, 2020
* Ensure script files in Docker builds are treated as executable.
* Updating git permissions to reflect executable for both secure.sh scripts.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
Signed-off-by: Kevin Doran <kdoran@apache.org>

This closes apache#4027.

Signed-off-by: Kevin Doran <kdoran@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants