From 5b98ee4fbd344052ef0e0ef31c2a7ae69f8d1ed3 Mon Sep 17 00:00:00 2001 From: Angel Rivera Date: Thu, 6 Feb 2020 10:52:34 -0500 Subject: [PATCH 01/10] Updated the terraform syntax to the new 0.12.20 standard Signed-off-by: Angel Rivera --- terraform/google_cloud/main.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/terraform/google_cloud/main.tf b/terraform/google_cloud/main.tf index 08244e3..b9e124c 100644 --- a/terraform/google_cloud/main.tf +++ b/terraform/google_cloud/main.tf @@ -1,21 +1,21 @@ variable "project_name" { - type = "string" + type = string default = "cicd-workshops" } variable "port_number" { - type = "string" + type = string default = "5000" } variable "docker_declaration" { - type = "string" + type = string # Change the image: string to match the docker image you want to use default = "spec:\n containers:\n - name: test-docker\n image: 'ariv3ra/python-cicd-workshop'\n stdin: false\n tty: false\n restartPolicy: Always\n" } variable "boot_image_name" { - type = "string" + type = string default = "projects/cos-cloud/global/images/cos-stable-69-10895-62-0" } @@ -25,14 +25,14 @@ data "google_compute_network" "default" { # Specify the provider (GCP, AWS, Azure) provider "google"{ - credentials = "${file("cicd_demo_gcp_creds.json")}" - project = "${var.project_name}" + credentials = file("cicd_demo_gcp_creds.json") + project = var.project_name region = "us-east1-b" } resource "google_compute_firewall" "http-5000" { name = "http-5000" - network = "${data.google_compute_network.default.name}" + network = data.google_compute_network.default.name allow { protocol = "icmp" @@ -40,7 +40,7 @@ resource "google_compute_firewall" "http-5000" { allow { protocol = "tcp" - ports = ["${var.port_number}"] + ports = [var.port_number] } } @@ -55,13 +55,13 @@ resource "google_compute_instance" "default" { boot_disk { auto_delete = true initialize_params { - image = "${var.boot_image_name}" + image = var.boot_image_name type = "pd-standard" } } metadata = { - gce-container-declaration = "${var.docker_declaration}" + gce-container-declaration = var.docker_declaration } labels = { @@ -77,5 +77,5 @@ resource "google_compute_instance" "default" { } output "Public_IP_Address" { - value = "${google_compute_instance.default.network_interface.0.access_config.0.nat_ip}" + value = google_compute_instance.default.network_interface[0].access_config[0].nat_ip } From 204267464dc97443c03305d9abb4da7c7d3e8460 Mon Sep 17 00:00:00 2001 From: tharathara <68540529+IT19180380@users.noreply.github.com> Date: Sat, 17 Oct 2020 23:06:19 +0530 Subject: [PATCH 02/10] Create testci-292817-a16bbc7e3610.json --- .../google_cloud/testci-292817-a16bbc7e3610.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 terraform/google_cloud/testci-292817-a16bbc7e3610.json diff --git a/terraform/google_cloud/testci-292817-a16bbc7e3610.json b/terraform/google_cloud/testci-292817-a16bbc7e3610.json new file mode 100644 index 0000000..3ebe581 --- /dev/null +++ b/terraform/google_cloud/testci-292817-a16bbc7e3610.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "testci-292817", + "private_key_id": "a16bbc7e3610c36ce46ecd85def70a560cdb1363", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQMF/OFxLo9Spt\n08jw2VKH/SP0i5Yfutt1Fk2iOVswzLa3depugfvjtle60Fqm9Moy6QIjQb8z4N9J\nM7nzG1O2qcgsBfsz7bpvjgfyxcS7M2/9v5c9tOPCmHHkP3a/sFKWCV8DclOzWWas\nkKBtQdGxVxmB+MQnejytxNjfJNO6PbtXExj0MQNdUrYhvfkMLksb27pdI1b4G6Og\nvRoGyOPhUz/glZSGW1+p7vc3PcdFM0TJtOWfSozxbXstaW1i3phUyU6pWnyhRrSf\nuMZsa0Wv2G42XWb7IOedSYiUitZO+smyqndn8rzz/8p6doHA1rKKdldWI+emlHTZ\naxHKRCXXAgMBAAECggEAQcNmIBXN1WTMeFD0IpCjr21ZVEBbtb4y4LOg5mOz2KBx\n/1XyLeJFjVLmN47lc+PTk21jTXvRSDP6lIcQcCjrssHDB5UEGw03XVHCVP//+xpu\nf/trbQSdBbVeFLmvazHphJeFOfN9WSQeeNhetOSbtqdK2XGZlNbaIBIUZ7icYTHY\n85YViSk/dor94oshSBoXhLq6Oj5J/pE5a7C9rNEsTq9Hw9uZs+pIl+UpsOqBzX0O\nSoAm0jzLd/W5S3goY6YPcDbKG61GNGGdui5n72JeWr8gQbiIOpLBhNxOfREKL+Ul\nI1Hto6SLegOARyCOslIPLxKVSX0XFCugKjuz3ULUEQKBgQDulb/4gTGiH1DpcH0o\nRwyMJanEBGNZIFHuX+kCbXr5DH49/iKYwu2QbXiLSz6ECPlf0buWicYCxen8/6Ao\nOKX4z1/NFfthyTN6tv918Pw7k/+whKsizW6N7pV8mZkgJW999DxkfuNEb+V6euuQ\nXCU5ouMsM5vZZtFaPWZgbDAj/QKBgQDfYqNeMHvZC9IDIhFOw46FhigVGeZZCypv\nRn120nlbfKr7dwWGg/E6hWARrJUBZiLY1K0LSgDrjg45L9Is58LPxQtlsnFCca/t\nHnb1DQbY4ORm7JLCLIWom1DOQdToeuudJ9L+MLsx/5oS7Wdnxi1V+BlCrcR3/LSI\nXxSeddyXYwKBgQDRCQtlY2xlKyLtJM3DmFx5/hW71ExnLlYakJXKtrljs3p4Pk15\nonAado+DG63uaR50wYGl55hBnb3hGObt1pQ0Zxz8xyG1D1+3SNaSM04LtSP1OIfo\nuiz+1ebLgJgU/jetF2xCcJoWwCNDKKdzmAhVc02u0Jjf5aHPerRUDvYu0QKBgQCb\nK5V31A3zkvZrHrsPD2Bs9+fX4InVyJ/NdBWq+EE8f7j1vJOmAPkMQaGeJVfMBPqn\ny/P4J4vEFIVkzAcfEk6MrL9iATYThY1DFSpkxou/E1kU9bhsESk3Gcxjue7/HoOU\nQxmZYJhn/rkz9J0jxNGxKgnB+5rCDlQJdqKIAC8fKQKBgHfLT240Mk4o5XFJKF1H\nQ1bCPn/I8QMvC2/BLBjFfZ46t/+Fx+ztiPJQcUwKFWWWzj8bgPh01a1kYp1PWw1E\n/CKh+B+8YdN/ixzsXus5A6phaDtlHHc3paJB0ewu7S+TmkEiAwFa1XrA0qGlU4Y2\nKscy5NOQ4mOAHh30qU0MwEqL\n-----END PRIVATE KEY-----\n", + "client_email": "testci@testci-292817.iam.gserviceaccount.com", + "client_id": "103716377880325665268", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/testci%40testci-292817.iam.gserviceaccount.com" +} From 654c289a257724f5a38e4f6b7b9e346fd1f16c51 Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 16:55:54 +0530 Subject: [PATCH 03/10] Update main.tf change availability zone --- terraform/google_cloud/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/google_cloud/main.tf b/terraform/google_cloud/main.tf index b9e124c..fe1cc19 100644 --- a/terraform/google_cloud/main.tf +++ b/terraform/google_cloud/main.tf @@ -1,6 +1,6 @@ variable "project_name" { type = string - default = "cicd-workshops" + default = "TestCI" } variable "port_number" { @@ -25,9 +25,9 @@ data "google_compute_network" "default" { # Specify the provider (GCP, AWS, Azure) provider "google"{ - credentials = file("cicd_demo_gcp_creds.json") + credentials = file("testci-292817-e231d1f65ebb.json") project = var.project_name - region = "us-east1-b" + region = "us-east1-c" } resource "google_compute_firewall" "http-5000" { From 2d8ed9b50ca698c7d077161454dc53f71b9c239c Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:00:04 +0530 Subject: [PATCH 04/10] Update main.tf changes --- terraform/google_cloud/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/google_cloud/main.tf b/terraform/google_cloud/main.tf index fe1cc19..e8e9001 100644 --- a/terraform/google_cloud/main.tf +++ b/terraform/google_cloud/main.tf @@ -32,14 +32,14 @@ provider "google"{ resource "google_compute_firewall" "http-5000" { name = "http-5000" - network = data.google_compute_network.default.name + network = data.google_compute_network.default.my_new_project allow { protocol = "icmp" } allow { - protocol = "tcp" + protocol = "udp" ports = [var.port_number] } } @@ -53,7 +53,7 @@ resource "google_compute_instance" "default" { ] boot_disk { - auto_delete = true + auto_delete = false initialize_params { image = var.boot_image_name type = "pd-standard" From 2b8c2f967656cda36e99c290e87c809877fe644d Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:04:22 +0530 Subject: [PATCH 05/10] Update Dockerfile change docer --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7208c12..fa073cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,9 @@ WORKDIR /opt/hello_world/ COPY requirements.txt . COPY dist/hello_world /opt/hello_world/ +cd /opt/apps +ls +mkdir test EXPOSE 80 From 858073151adbdf876eb70ab60d878b359c7fe912 Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:07:40 +0530 Subject: [PATCH 06/10] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index fa073cd..f9a6519 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ WORKDIR /opt/hello_world/ COPY requirements.txt . COPY dist/hello_world /opt/hello_world/ cd /opt/apps +cd /opt/new/test/testdoc ls mkdir test From 3560e224ca4332c16cbc4167695b028cf46e9602 Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:11:36 +0530 Subject: [PATCH 07/10] Update main.tf new new --- terraform/google_cloud/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/google_cloud/main.tf b/terraform/google_cloud/main.tf index e8e9001..cb41735 100644 --- a/terraform/google_cloud/main.tf +++ b/terraform/google_cloud/main.tf @@ -40,13 +40,13 @@ resource "google_compute_firewall" "http-5000" { allow { protocol = "udp" - ports = [var.port_number] + ports = [var.8080] } } resource "google_compute_instance" "default" { name = "default" - machine_type = "g1-small" + machine_type = "g1-large" zone = "us-east1-b" tags =[ "name","default" @@ -71,7 +71,7 @@ resource "google_compute_instance" "default" { network_interface { network = "default" access_config { - // Ephemeral IP + 192.168.1.1 } } } From 379b1c03de4e0e85ebd9de0407ec9a7b8ff9c559 Mon Sep 17 00:00:00 2001 From: user <68540529+IT19180380@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:15:53 +0530 Subject: [PATCH 08/10] Update main.tf --- terraform/google_cloud/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/google_cloud/main.tf b/terraform/google_cloud/main.tf index cb41735..c21dd90 100644 --- a/terraform/google_cloud/main.tf +++ b/terraform/google_cloud/main.tf @@ -5,7 +5,7 @@ variable "project_name" { variable "port_number" { type = string - default = "5000" + default = "8080" } variable "docker_declaration" { @@ -56,7 +56,7 @@ resource "google_compute_instance" "default" { auto_delete = false initialize_params { image = var.boot_image_name - type = "pd-standard" + type = "pd-defalt" } } @@ -77,5 +77,5 @@ resource "google_compute_instance" "default" { } output "Public_IP_Address" { - value = google_compute_instance.default.network_interface[0].access_config[0].nat_ip + value = google_compute_instance.default.network_interface[1].access_config[0].nat_ip } From 275d9c1bcff9fbf66cfa2f31336a2667c63c96ff Mon Sep 17 00:00:00 2001 From: Tharaka Dilshan <31246120+tharathara@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:07:04 +0530 Subject: [PATCH 09/10] add new commands --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index f9a6519..d263b1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,3 +13,6 @@ mkdir test EXPOSE 80 CMD [ "./hello_world" ] + +CMD ./install.sh +EXPOST 8000 From 08d31407faa360771ccc34b6deb002c9d271d9eb Mon Sep 17 00:00:00 2001 From: Tharaka Dilshan <31246120+tharathara@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:10:30 +0530 Subject: [PATCH 10/10] add new --- hello_world.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hello_world.py b/hello_world.py index 7756f2f..2add355 100644 --- a/hello_world.py +++ b/hello_world.py @@ -26,4 +26,8 @@ def hello_world(): return html if __name__ == '__main__': + app.run(host='0.0.0.0', port=5000) + + + if __name__ == '__main__': app.run(host='0.0.0.0', port=5000) \ No newline at end of file