From 627e77e026aae84e776feb83b091945ede199a5f Mon Sep 17 00:00:00 2001 From: Matheus Ragoso Date: Wed, 25 May 2022 12:43:50 -0300 Subject: [PATCH] added project name to limit compose scope, added compose-down comment --- owasp-top10-2016-mobile/m2/cool_games/server/Makefile | 5 +++-- owasp-top10-2016-mobile/m4/note-box/server/Makefile | 5 +++-- owasp-top10-2016-mobile/m5/panda_zap/server/Makefile | 5 +++-- owasp-top10-2021-apps/a1/camplake-api/Makefile | 5 +++-- owasp-top10-2021-apps/a1/ecommerce-api/Makefile | 5 +++-- .../a1/ecommerce-api/deployments/docker-compose.yml | 2 -- owasp-top10-2021-apps/a1/tictactoe/Makefile | 5 +++-- owasp-top10-2021-apps/a2/snake-pro/Makefile | 5 +++-- owasp-top10-2021-apps/a3/comment-killer/Makefile | 5 +++-- owasp-top10-2021-apps/a3/copy-n-paste/Makefile | 5 +++-- owasp-top10-2021-apps/a3/gossip-world/Makefile | 5 +++-- owasp-top10-2021-apps/a3/mongection/Makefile | 5 +++-- owasp-top10-2021-apps/a3/sstype/Makefile | 5 +++-- owasp-top10-2021-apps/a3/streaming/Makefile | 5 +++-- owasp-top10-2021-apps/a5/misconfig-wordpress/Makefile | 5 +++-- owasp-top10-2021-apps/a5/stegonography/Makefile | 5 +++-- owasp-top10-2021-apps/a5/vinijr-blog/Makefile | 5 +++-- owasp-top10-2021-apps/a6/cimentech/Makefile | 5 +++-- owasp-top10-2021-apps/a6/golden-hat/Makefile | 5 +++-- owasp-top10-2021-apps/a7/insecure-go-project/Makefile | 5 +++-- owasp-top10-2021-apps/a7/saidajaula-monster/Makefile | 5 +++-- owasp-top10-2021-apps/a8/amarelo-designs/Makefile | 5 +++-- owasp-top10-2021-apps/a9/games-irados/Makefile | 5 +++-- 23 files changed, 66 insertions(+), 46 deletions(-) diff --git a/owasp-top10-2016-mobile/m2/cool_games/server/Makefile b/owasp-top10-2016-mobile/m2/cool_games/server/Makefile index e3174bdf8..4ccf71a75 100644 --- a/owasp-top10-2016-mobile/m2/cool_games/server/Makefile +++ b/owasp-top10-2016-mobile/m2/cool_games/server/Makefile @@ -25,10 +25,11 @@ install: env compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2016-mobile/m4/note-box/server/Makefile b/owasp-top10-2016-mobile/m4/note-box/server/Makefile index 5e6075952..08dc5215c 100644 --- a/owasp-top10-2016-mobile/m4/note-box/server/Makefile +++ b/owasp-top10-2016-mobile/m4/note-box/server/Makefile @@ -25,10 +25,11 @@ install: env compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2016-mobile/m5/panda_zap/server/Makefile b/owasp-top10-2016-mobile/m5/panda_zap/server/Makefile index bafecf12b..a250f651a 100644 --- a/owasp-top10-2016-mobile/m5/panda_zap/server/Makefile +++ b/owasp-top10-2016-mobile/m5/panda_zap/server/Makefile @@ -25,10 +25,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f docker-compose.yml up -d --build --force-recreate + docker-compose -f docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f docker-compose.yml down -v --remove-orphans + docker-compose -f docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a1/camplake-api/Makefile b/owasp-top10-2021-apps/a1/camplake-api/Makefile index d9bfad2da..d83ef53e7 100644 --- a/owasp-top10-2021-apps/a1/camplake-api/Makefile +++ b/owasp-top10-2021-apps/a1/camplake-api/Makefile @@ -16,10 +16,11 @@ install: generate-passwords compose ## Runs project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Generates passwords and set them as environment variables generate-passwords: diff --git a/owasp-top10-2021-apps/a1/ecommerce-api/Makefile b/owasp-top10-2021-apps/a1/ecommerce-api/Makefile index 15a71cccf..90f9a04e4 100644 --- a/owasp-top10-2021-apps/a1/ecommerce-api/Makefile +++ b/owasp-top10-2021-apps/a1/ecommerce-api/Makefile @@ -47,10 +47,11 @@ lint: ## Runs project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Generates passwords and set them as environment variables generate-passwords: diff --git a/owasp-top10-2021-apps/a1/ecommerce-api/deployments/docker-compose.yml b/owasp-top10-2021-apps/a1/ecommerce-api/deployments/docker-compose.yml index fc4e7611e..60f7ab9c3 100644 --- a/owasp-top10-2021-apps/a1/ecommerce-api/deployments/docker-compose.yml +++ b/owasp-top10-2021-apps/a1/ecommerce-api/deployments/docker-compose.yml @@ -10,8 +10,6 @@ services: MONGO_DATABASE_NAME: DB MONGO_PORT: 27017 MONGO_TIMEOUT: 60 - MONGO_PORT: 27017 - MONGO_TIMEOUT: 60 env_file: - dockers.env build: diff --git a/owasp-top10-2021-apps/a1/tictactoe/Makefile b/owasp-top10-2021-apps/a1/tictactoe/Makefile index 09203e3df..6cbceba4c 100644 --- a/owasp-top10-2021-apps/a1/tictactoe/Makefile +++ b/owasp-top10-2021-apps/a1/tictactoe/Makefile @@ -15,10 +15,11 @@ install: env compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Generate new environment variables for Stegonography app env: diff --git a/owasp-top10-2021-apps/a2/snake-pro/Makefile b/owasp-top10-2021-apps/a2/snake-pro/Makefile index 31110c766..95203f085 100644 --- a/owasp-top10-2021-apps/a2/snake-pro/Makefile +++ b/owasp-top10-2021-apps/a2/snake-pro/Makefile @@ -23,10 +23,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a3/comment-killer/Makefile b/owasp-top10-2021-apps/a3/comment-killer/Makefile index a07d85dd1..c14b453bd 100644 --- a/owasp-top10-2021-apps/a3/comment-killer/Makefile +++ b/owasp-top10-2021-apps/a3/comment-killer/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Runs project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Deploys project and view docker logs deploy: compose diff --git a/owasp-top10-2021-apps/a3/copy-n-paste/Makefile b/owasp-top10-2021-apps/a3/copy-n-paste/Makefile index ec0182d64..c436dee02 100644 --- a/owasp-top10-2021-apps/a3/copy-n-paste/Makefile +++ b/owasp-top10-2021-apps/a3/copy-n-paste/Makefile @@ -21,10 +21,11 @@ test: go test ./... ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans exploit: chmod +x deployments/exploit.sh diff --git a/owasp-top10-2021-apps/a3/gossip-world/Makefile b/owasp-top10-2021-apps/a3/gossip-world/Makefile index f484346c4..458005a05 100644 --- a/owasp-top10-2021-apps/a3/gossip-world/Makefile +++ b/owasp-top10-2021-apps/a3/gossip-world/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Runs project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Deploys project and view docker logs deploy: compose diff --git a/owasp-top10-2021-apps/a3/mongection/Makefile b/owasp-top10-2021-apps/a3/mongection/Makefile index 9836f5b8c..de03949ed 100644 --- a/owasp-top10-2021-apps/a3/mongection/Makefile +++ b/owasp-top10-2021-apps/a3/mongection/Makefile @@ -15,10 +15,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase - You can find that the check-init.sh script is also in the docs folder. msg: diff --git a/owasp-top10-2021-apps/a3/sstype/Makefile b/owasp-top10-2021-apps/a3/sstype/Makefile index 87da8b9ca..e1f92237e 100644 --- a/owasp-top10-2021-apps/a3/sstype/Makefile +++ b/owasp-top10-2021-apps/a3/sstype/Makefile @@ -15,10 +15,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase - You can find that the check-init.sh script is also in the docs folder. msg: diff --git a/owasp-top10-2021-apps/a3/streaming/Makefile b/owasp-top10-2021-apps/a3/streaming/Makefile index 4ecfd3aa2..af82603e0 100644 --- a/owasp-top10-2021-apps/a3/streaming/Makefile +++ b/owasp-top10-2021-apps/a3/streaming/Makefile @@ -24,10 +24,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase - You can find that the check-init.sh script is also in the docs folder. msg: diff --git a/owasp-top10-2021-apps/a5/misconfig-wordpress/Makefile b/owasp-top10-2021-apps/a5/misconfig-wordpress/Makefile index bf5543660..7f4ac236b 100644 --- a/owasp-top10-2021-apps/a5/misconfig-wordpress/Makefile +++ b/owasp-top10-2021-apps/a5/misconfig-wordpress/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a5/stegonography/Makefile b/owasp-top10-2021-apps/a5/stegonography/Makefile index 7e20bc07e..7ef7ee7bd 100644 --- a/owasp-top10-2021-apps/a5/stegonography/Makefile +++ b/owasp-top10-2021-apps/a5/stegonography/Makefile @@ -15,10 +15,11 @@ install: env compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Generate new environment variables for Stegonography app env: diff --git a/owasp-top10-2021-apps/a5/vinijr-blog/Makefile b/owasp-top10-2021-apps/a5/vinijr-blog/Makefile index 96089e618..3f3a9246b 100644 --- a/owasp-top10-2021-apps/a5/vinijr-blog/Makefile +++ b/owasp-top10-2021-apps/a5/vinijr-blog/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a6/cimentech/Makefile b/owasp-top10-2021-apps/a6/cimentech/Makefile index 76c53b6bf..ed09ca5f0 100644 --- a/owasp-top10-2021-apps/a6/cimentech/Makefile +++ b/owasp-top10-2021-apps/a6/cimentech/Makefile @@ -15,10 +15,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a6/golden-hat/Makefile b/owasp-top10-2021-apps/a6/golden-hat/Makefile index e92ff2504..7148b76be 100644 --- a/owasp-top10-2021-apps/a6/golden-hat/Makefile +++ b/owasp-top10-2021-apps/a6/golden-hat/Makefile @@ -24,10 +24,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase - You can find that the check-init.sh script is also in the docs folder. msg: diff --git a/owasp-top10-2021-apps/a7/insecure-go-project/Makefile b/owasp-top10-2021-apps/a7/insecure-go-project/Makefile index f1e6232b6..574e4eda6 100644 --- a/owasp-top10-2021-apps/a7/insecure-go-project/Makefile +++ b/owasp-top10-2021-apps/a7/insecure-go-project/Makefile @@ -25,10 +25,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a7/saidajaula-monster/Makefile b/owasp-top10-2021-apps/a7/saidajaula-monster/Makefile index 738f4738e..802f8a239 100644 --- a/owasp-top10-2021-apps/a7/saidajaula-monster/Makefile +++ b/owasp-top10-2021-apps/a7/saidajaula-monster/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a8/amarelo-designs/Makefile b/owasp-top10-2021-apps/a8/amarelo-designs/Makefile index 525fffeff..6ed72ea44 100644 --- a/owasp-top10-2021-apps/a8/amarelo-designs/Makefile +++ b/owasp-top10-2021-apps/a8/amarelo-designs/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Composes project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: diff --git a/owasp-top10-2021-apps/a9/games-irados/Makefile b/owasp-top10-2021-apps/a9/games-irados/Makefile index 2767aeeb0..764577ddb 100644 --- a/owasp-top10-2021-apps/a9/games-irados/Makefile +++ b/owasp-top10-2021-apps/a9/games-irados/Makefile @@ -16,10 +16,11 @@ install: compose msg ## Run project using docker-compose compose: compose-down - docker-compose -f deployments/docker-compose.yml up -d --build --force-recreate + docker-compose -f deployments/docker-compose.yml -p secDevLabs up -d --build --force-recreate +## Down project using docker-compose compose-down: - docker-compose -f deployments/docker-compose.yml down -v --remove-orphans + docker-compose -f deployments/docker-compose.yml -p secDevLabs down -v --remove-orphans ## Prints initialization message after compose phase msg: