From 8a69102fb4a101d75ad0f01cfbf852a1ac16a6bf Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:24:36 +0000 Subject: [PATCH 01/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index c3e5d3176..76d057fb6 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -24,5 +24,5 @@ jobs: run: | cd ./python echo "${{ secrets.DOCKERPW }}" | docker login -u "[your dockerhub login here]" --password-stdin - docker image build -t [your dockerhub username here]/gitops:hellov1.0 . - docker push [your docker hub username here]/gitops:hellov1.0 + docker image build -t [your dockerhub username here]/gitops:hellov1.2 . + docker push [your docker hub username here]/gitops:hellov1.2 From 81dcf240ab92be03a05fa4ffa204100bcaad5734 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:25:34 +0000 Subject: [PATCH 02/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 358088e4c..2576f2ac6 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello World!" + return "Hello LA Student!" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 2eaa6dfa1d238d91f38be08cdb2c07727db873f5 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:30:18 +0000 Subject: [PATCH 03/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 2576f2ac6..fb4675424 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student!" + return "Hello LA Student! Again" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 17770e8e0cee2a5c623c5d7f6462b57aa0fad4ab Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:33:50 +0000 Subject: [PATCH 04/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 76d057fb6..bad950672 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -23,6 +23,6 @@ jobs: - name: Build & Push Image run: | cd ./python - echo "${{ secrets.DOCKERPW }}" | docker login -u "[your dockerhub login here]" --password-stdin + echo "${{ secrets.DOCKERPW }}" | docker login -u "anwar.s.akram@gmail.com" --password-stdin docker image build -t [your dockerhub username here]/gitops:hellov1.2 . docker push [your docker hub username here]/gitops:hellov1.2 From 995d80dae60e78ca98efeadfe265e06e34fe8c33 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:34:20 +0000 Subject: [PATCH 05/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index fb4675424..2a938ed8f 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again" + return "Hello LA Student! Again Again" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 0b85410db24178006885854140cc3b42d7b6beba Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:35:37 +0000 Subject: [PATCH 06/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index bad950672..41d575682 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -23,6 +23,6 @@ jobs: - name: Build & Push Image run: | cd ./python - echo "${{ secrets.DOCKERPW }}" | docker login -u "anwar.s.akram@gmail.com" --password-stdin + echo "${{ secrets.DOCKERPW }}" | docker login -u "aakram786" --password-stdin docker image build -t [your dockerhub username here]/gitops:hellov1.2 . docker push [your docker hub username here]/gitops:hellov1.2 From ea45d4f540db62c914e210b0ab1a5d43146d1234 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:36:08 +0000 Subject: [PATCH 07/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 2a938ed8f..a2a70bd47 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again" + return "Hello LA Student! Again Again 3rd time lucky" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 6a19287efceb3bae691084b50178adc7a09da31c Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:38:32 +0000 Subject: [PATCH 08/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 41d575682..6b9779faa 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -24,5 +24,5 @@ jobs: run: | cd ./python echo "${{ secrets.DOCKERPW }}" | docker login -u "aakram786" --password-stdin - docker image build -t [your dockerhub username here]/gitops:hellov1.2 . - docker push [your docker hub username here]/gitops:hellov1.2 + docker image build -t aakram786/gitops:hellov1.2 . + docker push aakram786/gitops:hellov1.2 From 9d1ddc4ec009ab0d185637ebb0aacb987bf99ef9 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:38:57 +0000 Subject: [PATCH 09/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index a2a70bd47..438094f00 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again 3rd time lucky" + return "Hello LA Student! Again Again 3rd time lucky wow" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From d77d31921368cf2ccbe457e16b7d1aa0e8a04b00 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:42:00 +0000 Subject: [PATCH 10/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 6b9779faa..df775e3a4 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -1,7 +1,7 @@ name: Python application on: - push: + pull: paths: - 'python/*' From 9fcfcd0339a742739aa6805c01bfe2394ddd82c9 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:43:53 +0000 Subject: [PATCH 11/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 438094f00..87df2728b 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again 3rd time lucky wow" + return "Hello LA Student! Again Again 3rd time lucky wow test pull" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From e01979a06248a0b3490acba8f521352e5957b9e4 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:44:36 +0000 Subject: [PATCH 12/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 87df2728b..761ac3758 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again 3rd time lucky wow test pull" + return "Hello LA Student! Again Again 3rd time lucky wow test pull request from master" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From b7965c6b0e25cd65bea732d67613b40effe3ca7d Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:49:28 +0000 Subject: [PATCH 13/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 761ac3758..a1def13c1 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again 3rd time lucky wow test pull request from master" + return "Hello LA Student! Again Again 3rd time lucky wow t" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 554c45d45ac8818a9fb46f52ba9f52de13adc546 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:55:17 +0000 Subject: [PATCH 14/18] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index df775e3a4..044838a8d 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -1,7 +1,7 @@ name: Python application on: - pull: + pull_request: paths: - 'python/*' From 2b0a4b92f8a8b6d0b095b872c7388cff886e8d2d Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:55:51 +0000 Subject: [PATCH 15/18] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index a1def13c1..387562c7d 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello LA Student! Again Again 3rd time lucky wow t" + return "Hello LA Student! Pull request" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From d68f36df6a09709021d87775f17d41601264a7a1 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 3 Jan 2022 23:02:22 +0000 Subject: [PATCH 16/18] Create hello.yaml --- workloads/hello.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 workloads/hello.yaml diff --git a/workloads/hello.yaml b/workloads/hello.yaml new file mode 100644 index 000000000..c0e630aa6 --- /dev/null +++ b/workloads/hello.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: hello + namespace: lasample + labels: + app: hello +spec: + selector: + matchLabels: + app: hello + template: + metadata: + labels: + app: hello + spec: + containers: + - name: hello + image: linuxacademycontent/gitops:hellov1.0 From 40c7462f75d13561e173f08c20e1d4cd9d63f6f0 Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:18:16 +0000 Subject: [PATCH 17/18] Create main.yml --- .github/workflows/main.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..3eef51aec --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,19 @@ +on: [push] + +jobs: + zap_scan: + runs-on: ubuntu-latest + name: Scan the webapplication + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: master + - name: ZAP Scan + uses: zaproxy/action-full-scan@v0.3.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + docker_name: 'owasp/zap2docker-stable' + target: 'http://itsecgames.com/ + rules_file_name: '.zap/rules.tsv' + cmd_options: '-a' From 1326c99925fa5baeb06a47ff21169981a24c9d0e Mon Sep 17 00:00:00 2001 From: aakram786 <30791579+aakram786@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:21:40 +0000 Subject: [PATCH 18/18] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3eef51aec..5fd4c4308 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,6 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} docker_name: 'owasp/zap2docker-stable' - target: 'http://itsecgames.com/ + target: 'http://itsecgames.com/' rules_file_name: '.zap/rules.tsv' cmd_options: '-a'