From 0df27b8e8facab49cbdb6c00d087defdb7039c65 Mon Sep 17 00:00:00 2001
From: Ozgur Ozturk <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 10:24:10 +0200
Subject: [PATCH 01/12] ilk commit

---
 docker-compose.yml  | 12 ++++++++----
 frontend/index.html |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 17c8a74..f42c997 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,23 @@
 version: '3'
 services:
   frontend:
-    image: ozgurozturknet/fe:proje
+    image: frontend
     ports:
       - "3000:80"
     # Add any additional configuration for service1 here
 
   backend:
-    image: ozgurozturknet/be:proje
+    image: backend
     ports:
       - "5000:80"
+    environment:
+      - DB_HOST=database
+      - DB_USERNAME=todo_admin
+      - DB_PASSWORD=password
+      - DB_NAME=todo_app
     # Add any additional configuration for service2 here
-
   database:
-    image: ozgurozturknet/db:proje
+    image: database
     ports:
       - "3306:3306"
     environment:
diff --git a/frontend/index.html b/frontend/index.html
index 8ba8a34..30cefed 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -5,12 +5,12 @@
     <title>HTML Web Page</title>
   </head>
   <body>
-    <h1>Merhaba BBDevOpsBootCamp Proje Ekibi</h1>
+    <h1>Merhaba Siemens R&D Ekibi</h1>
     <h1>::Yapilacaklar Listesi::</h1>
     <div id="todos"></div>
 
     <script>
-      fetch("http://backend.ayti.tech/")
+      fetch("http://127.0.0.1:5000")
         .then((response) => response.json())
         .then((data) => {
           const todos = document.getElementById("todos");

From dfe29dc7a3cd3afd802c32a3f4d116dd1a778bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 11:22:14 +0200
Subject: [PATCH 02/12] ci pipeline init

---
 .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..29c9fe0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,26 @@
+name: Continues Integration Pipeline
+
+on:
+    push:
+    workflow_dispatch:
+
+
+
+
+jobs:
+    dockerimagebuild:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Login to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+ 
+ 
+            - name: FrontEndBuildAndPush
+              uses: docker/build-push-action@v6
+              with:
+                  file: ./Dockerfile.fe
+                  push: true
+                  tags: ozgurozturknet/siemensgitegitim:frontend

From 6677602b8ea17158ab3ab3e75557fd91851f7bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 12:49:34 +0200
Subject: [PATCH 03/12] ci workflow tamamlandi

---
 .github/workflows/ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29c9fe0..0335418 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,9 @@ jobs:
     dockerimagebuild:
         runs-on: ubuntu-latest
         steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
             - name: Login to Docker Hub
               uses: docker/login-action@v3
               with:
@@ -24,3 +27,17 @@ jobs:
                   file: ./Dockerfile.fe
                   push: true
                   tags: ozgurozturknet/siemensgitegitim:frontend
+
+            - name: BackendEndBuildAndPush
+              uses: docker/build-push-action@v6
+              with:
+                  file: ./Dockerfile.be
+                  push: true
+                  tags: ozgurozturknet/siemensgitegitim:backend
+
+            - name: DatabaseBuildAndPush
+              uses: docker/build-push-action@v6
+              with:
+                  file: ./Dockerfile.db
+                  push: true
+                  tags: ozgurozturknet/siemensgitegitim:database
\ No newline at end of file

From f4533e2f98ef6524d966542021b93400ee5ff302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 13:00:11 +0200
Subject: [PATCH 04/12] ci pull requestle calissin

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0335418..bb155b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,12 +1,10 @@
 name: Continues Integration Pipeline
 
 on:
-    push:
+    pull_request:
+        branches: [ main ]
     workflow_dispatch:
 
-
-
-
 jobs:
     dockerimagebuild:
         runs-on: ubuntu-latest

From 64f3153a29d5f3668e31e630a352d29caea03512 Mon Sep 17 00:00:00 2001
From: Ozgur Ozturk <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 13:04:42 +0200
Subject: [PATCH 05/12] test ediyoruz pr surecini

---
 README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5f8b4b6
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# Bu test uygulamasıdır
\ No newline at end of file

From d681c56e2de86f30ac033bb0a65aec01a9ec755f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:09:13 +0200
Subject: [PATCH 06/12] =?UTF-8?q?cd=20tamamland=C4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml         |  3 ++-
 .github/workflows/deployment.yml | 23 +++++++++++++++++++++++
 docker-compose.yml               |  6 +++---
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/deployment.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb155b2..84cd3e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,4 +38,5 @@ jobs:
               with:
                   file: ./Dockerfile.db
                   push: true
-                  tags: ozgurozturknet/siemensgitegitim:database
\ No newline at end of file
+                  tags: ozgurozturknet/siemensgitegitim:database
+      
\ No newline at end of file
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
new file mode 100644
index 0000000..0a64ca1
--- /dev/null
+++ b/.github/workflows/deployment.yml
@@ -0,0 +1,23 @@
+name: ProdDeployment
+
+on:
+    push:
+        branches: [ deploy ]
+    workflow_dispatch:
+
+jobs:
+    deployment:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+
+            - name: Deploy to Docker swarm
+              uses: wshihadeh/docker-deployment-action@v1
+              with:
+                remote_docker_host: ubuntu@3.125.43.15
+                ssh_private_key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+                deployment_mode: docker-compose
+                stack_file_name: docker-compose.yml
+                args: my_application
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index f42c997..42faf8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   frontend:
-    image: frontend
+    image: ozgurozturknet/siemensgitegitim:frontend
     ports:
       - "3000:80"
     # Add any additional configuration for service1 here
 
   backend:
-    image: backend
+    image: ozgurozturknet/siemensgitegitim:backend
     ports:
       - "5000:80"
     environment:
@@ -17,7 +17,7 @@ services:
       - DB_NAME=todo_app
     # Add any additional configuration for service2 here
   database:
-    image: database
+    image: ozgurozturknet/siemensgitegitim:database
     ports:
       - "3306:3306"
     environment:

From 9951655aede0c8f9a7680f3cf49981a1c665bd4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:12:21 +0200
Subject: [PATCH 07/12] secrets.DOCKER_SSH_PUBLIC_KEY  eklendi,

---
 .github/workflows/deployment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 0a64ca1..19faf1f 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -18,6 +18,7 @@ jobs:
               with:
                 remote_docker_host: ubuntu@3.125.43.15
                 ssh_private_key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+                ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
                 args: my_application
\ No newline at end of file

From b768d8e5a3902052bc196d95fd7ba19d34f5d4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:20:12 +0200
Subject: [PATCH 08/12] ssdas

---
 .github/workflows/deployment.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 19faf1f..1630f88 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -21,4 +21,7 @@ jobs:
                 ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
-                args: my_application
\ No newline at end of file
+                args: my_application
+                copy_stack_file: true
+                deploy_path: /home/ubuntu
+                keep_files: 5
\ No newline at end of file

From 51ae4f4b70c51af2a0579629d49edace0873045c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:21:11 +0200
Subject: [PATCH 09/12] dsaasd

---
 .github/workflows/deployment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 1630f88..10c75ac 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -21,7 +21,6 @@ jobs:
                 ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
-                args: my_application
                 copy_stack_file: true
                 deploy_path: /home/ubuntu
                 keep_files: 5
\ No newline at end of file

From 2ef4cd7abe71e1e4e6852d61cb798a5eca81a0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:22:46 +0200
Subject: [PATCH 10/12] ssas

---
 .github/workflows/deployment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 10c75ac..7c605dc 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -21,6 +21,7 @@ jobs:
                 ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
+                args: -p my_application
                 copy_stack_file: true
                 deploy_path: /home/ubuntu
                 keep_files: 5
\ No newline at end of file

From 95c5777ae637b486070243ad1806c5124e0fc294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:24:24 +0200
Subject: [PATCH 11/12] dssdsd

---
 .github/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 7c605dc..9ddf21c 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -21,7 +21,7 @@ jobs:
                 ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
-                args: -p my_application
+                args: ""
                 copy_stack_file: true
                 deploy_path: /home/ubuntu
                 keep_files: 5
\ No newline at end of file

From 741abc054d5449393d6fa88a5dc7a85044f2b2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20=C3=96ZT=C3=9CRK?= <ozgur@ozgurozturk.net>
Date: Thu, 27 Jun 2024 14:26:43 +0200
Subject: [PATCH 12/12] dfssdds

---
 .github/workflows/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 9ddf21c..d8ebb1c 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -21,7 +21,7 @@ jobs:
                 ssh_public_key: ${{ secrets.DOCKER_SSH_PUBLIC_KEY }}
                 deployment_mode: docker-compose
                 stack_file_name: docker-compose.yml
-                args: ""
+                args: "--ansi always"
                 copy_stack_file: true
                 deploy_path: /home/ubuntu
                 keep_files: 5
\ No newline at end of file
