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.

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

Jump to bottom

Updated Dockerfile, added Jenkinsfile. #16523

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated Dockerfile, added Jenkinsfile. #16523

wants to merge 2 commits into from

Conversation

chadduffin
Copy link
Contributor

An updated Dockerfile is important so that anyone can build and run W3AF anywhere. Along with being able to build it, it is useful to be able to build this image with CI so that the most up to date version can be easily and automatically maintained.

This pull request contains:

  • An updated Dockerfile.
    • More recent base image is being used.
    • Layers have been significantly compacted.
    • Pip dependencies have been fixed and update.
    • Updated deprecated directives.
  • A Jenkinsfile.
    • This pipeline performs the build, push and cleaning steps that typically occurred in the provided build script.
    • Functional, was used to push this image: https://hub.docker.com/r/liatrio/w3af/
  • 'simple-docker-build.sh'
    • Provides basic Docker build functionality.
  • Miscellaneous file with references to Pip dependencies updated to match Dockerfile.
  • Previous Dockerfile backed up in /extras/docker/ubuntu:12.04.

@chadduffin chadduffin changed the title Update Dockerfile, added Jenkinsfile. Updated Dockerfile, added Jenkinsfile. Feb 2, 2018
andresriancho
andresriancho reviewed Feb 10, 2018
View reviewed changes
Copy link
Owner

@andresriancho andresriancho 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 this great PR, the dockerfile needed some maintenance 👍

Some of my comments went inline with the code, some other comments here:

  • Jenkinsfile: w3af uses circleci for builds (see circle.yml in root directory). When a build succeeds then a new docker image is build and pushed. Builds haven't been passing for some time now... that it why we don't get fresh docker images in hub.docker.com. Please remove this file since we won't use it: adding another build system doesn't make much sense.

  • Please send the PR against the develop branch which has significant improvements from master and, for example, a different set of pip requirements.

extras/docker/ubuntu:12.04/Dockerfile
@@ -0,0 +1,92 @@
# w3af.org
Copy link
Owner

Choose a reason for hiding this comment

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

I believe that we can safely remove this file, we don't really need the backup.

w3af/core/controllers/dependency_check/requirements.py
@@ -25,7 +25,7 @@
GUI = 2


CORE_PIP_PACKAGES = [PIPDependency('pyclamd', 'pyClamd', '0.3.15'),
CORE_PIP_PACKAGES = [PIPDependency('pyclamd', 'pyClamd', '0.4.0'),
Copy link
Owner

Choose a reason for hiding this comment

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

Just upgraded develop to use this lib version

w3af/core/controllers/dependency_check/requirements.py
@@ -36,7 +36,7 @@
PIPDependency('tblib', 'tblib', '0.2.0'),
PIPDependency('pdfminer', 'pdfminer', '20140328'),
PIPDependency('concurrent.futures', 'futures', '2.1.5'),
PIPDependency('OpenSSL', 'pyOpenSSL', '0.15.1'),
PIPDependency('OpenSSL', 'pyOpenSSL', '16.2.0'),
Copy link
Owner

Choose a reason for hiding this comment

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

The develop branch already uses a newer version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andresriancho andresriancho andresriancho left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chadduffin @andresriancho