Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) #1667

Closed
wants to merge 59 commits into from
Closed

Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) #1667

wants to merge 59 commits into from

Conversation

bittner
Copy link
Contributor

@bittner bittner commented Jan 24, 2020

Removes the entire util/docker folder, which has been migrated to a dedicated repository.

See https://github.com/CRS-support/modsecurity-crs-docker

This PR should be merged after the CRS test suite has been refactored to use the owasp/modsecurity-crs image from Docker Hub, and passes obviously.

Relates to:

@bittner bittner changed the title Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) WIP: Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) Jan 24, 2020
@bittner
Copy link
Contributor Author

bittner commented Feb 12, 2020

PR #1684 has just been merged. We should now be safe to remove the util/Docker folder with the legacy Dockerfiles. Any objections?

@bittner bittner changed the title WIP: Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) Remove /util/docker folder from v3.3/dev branch (now in dedicated repo) Feb 12, 2020
@dune73
Copy link
Contributor

dune73 commented Feb 12, 2020

Not sure the removal is really, really permanent. Let's hold this back a bit more until we are really sure.

(Yes, I know this is all dragging along. Sorry about that.)

@fzipi
Copy link
Contributor

fzipi commented Mar 2, 2020

Yes please. I'm porting this to GHA, so wait a little bit longer.

@bittner
Copy link
Contributor Author

bittner commented Mar 3, 2020

Not sure if we all have the same understanding:

The code from /util/docker is already integrated into the CRS-support/modsecurity-crs-docker and CRS-support/modsecurity-docker projects, which build their respective Docker images automatically.

Removing files here would just be a cleanup measure, and to reduce potential confusion.

We'll integrate more and advance more with those two repositories in the weeks to come.

@fzipi
Copy link
Contributor

fzipi commented Mar 3, 2020

I saw and understood that.

For me the problem right now is that we need to be in sync because we used to have a docker that tested properly, but was constructed using a local Dockerfile.

Now moving it away, we need to be sure that our objectives keep being the same (I know it is the CRS support 😄 ), but just to be aware of that.

If we want to remove it, I'm not oppossing to.

fzipi and others added 16 commits May 13, 2020 14:05
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
fix(ci): change test name and fix default params
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
fix(docs): update badges and links in readme
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
lifeforms and others added 30 commits May 27, 2020 14:02
Cache-Control: a strict whitelist of possible values
Fix spelling in 3.3.0 changelog
fix: change msg values to not span multiple lines
fix typos found by fossies codespell
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
Decrease processing time of rules, fixes #1665 #1708
…rectives

Handle multiple directives in 920510
Executing linting on every commit makes more sense, and then regression only on tests or rules changed only

Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
feat(lint): split actions in linting and regression
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.