Skip to content

Clear dockerfiles 🐋#3770

Merged
psiinon merged 1 commit intozaproxy:developfrom
flibustier:develop
Oct 9, 2017
Merged

Clear dockerfiles 🐋#3770
psiinon merged 1 commit intozaproxy:developfrom
flibustier:develop

Conversation

@flibustier
Copy link
Contributor

@flibustier flibustier commented Jul 20, 2017

List of changes :

  • Remove MAINTAINER because it's deprecated
  • 2 dependencies were duplicated (x11vnc and xvfb)
  • pip install python-owasp-zap-v2.4 was already satisfied by zapcli
  • add -na flag to wget for a better output
  • remove export JAVA_HOME from script because it's already defined in Dockerfile
  • remove whitespaces at end of lines

psiinon
psiinon reviewed Jul 20, 2017
View reviewed changes
thc202
thc202 reviewed Jul 21, 2017
View reviewed changes
thc202
thc202 reviewed Sep 28, 2017
View reviewed changes
Copy link
Member

@thc202 thc202 left a comment

Choose a reason for hiding this comment

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

Changes look good, just added a minor comment.

Could you squash the commits?

@thc202 thc202 added Docker and removed Type-Task labels Sep 28, 2017
@thc202
Copy link
Member

thc202 commented Oct 9, 2017

Resolved the conflicts, addressed the last comments and added the maintainer label (same as in #3808).

@psiinon psiinon merged commit 858c9b9 into zaproxy:develop Oct 9, 2017
@thc202
Copy link
Member

thc202 commented Oct 9, 2017

@flibustier thanks! How would you like to be credited?
https://github.com/zaproxy/zap-core-help/wiki/HelpCredits

@anantshri anantshri mentioned this pull request Oct 9, 2017
Closed
@flibustier
Copy link
Contributor Author

flibustier commented Oct 10, 2017

Hi ! Sorry I wasn't available this last few days… Thanks for merging! 👍
For the credit, it's at your convenience :)

@kingthorin
Copy link
Member

kingthorin commented Oct 10, 2017

Check the page he linked, let us know what name/handle/whatever you'd like listed.

@flibustier
Copy link
Contributor Author

flibustier commented Oct 10, 2017

Okay I get it! "Jon (@flibustier)" will be fine, thank you very much :)

thc202 added a commit to thc202/zap-core-help that referenced this pull request Oct 10, 2017
@thc202
Update Credits help page
8b52de1 
Add the following contributors:
 - Jonathan Claudius (from zaproxy/zaproxy#3810);
 - Jon (@flibustier) (from zaproxy/zaproxy#3770).
@thc202 thc202 mentioned this pull request Oct 10, 2017
Merged
@thc202
Copy link
Member

thc202 commented Oct 10, 2017

Thank you!

@lock
Copy link

lock bot commented Nov 1, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked and limited conversation to collaborators Nov 1, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@psiinon psiinon psiinon approved these changes

@thc202 thc202 thc202 approved these changes

+1 more reviewer

@Grunny Grunny Grunny left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Docker enhancement

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@flibustier @thc202 @kingthorin @Grunny @psiinon