From e0cbdb6b9e329e94db478bdbe6e095276a5c85a5 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson Date: Thu, 9 Mar 2023 16:46:03 +0100 Subject: [PATCH 01/12] push --- app/docker-compose.yml | 25 +++++++++++++++++++++++++ build.sh | 0 2 files changed, 25 insertions(+) create mode 100644 app/docker-compose.yml mode change 100755 => 100644 build.sh diff --git a/app/docker-compose.yml b/app/docker-compose.yml new file mode 100644 index 000000000..0598445c7 --- /dev/null +++ b/app/docker-compose.yml @@ -0,0 +1,25 @@ +services: + frontend: + image: node:18-alpine + command: sh -c "yarn install && yarn run dev" + ports: + - 3000:3000 + working_dir: /app + volumes: + - ./:/app + environment: + MYSQL_HOST: backend + MYSQL_USER: root + MYSQL_PASSWORD: secret + MYSQL_DB: todos + + backend: + image: mysql:8.0 + volumes: + - todo-mysql-data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: todos + +volumes: + todo-mysql-data: \ No newline at end of file diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 From a2a86deb68997d8d6b6db010c549bc75b47ae32c Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:21:03 +0100 Subject: [PATCH 02/12] Update docker-compose.yml --- app/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 0598445c7..7ce6a64fa 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ./:/app environment: - MYSQL_HOST: backend + MYSQL_HOST: 192.168.0.13 MYSQL_USER: root MYSQL_PASSWORD: secret MYSQL_DB: todos @@ -22,4 +22,4 @@ services: MYSQL_DATABASE: todos volumes: - todo-mysql-data: \ No newline at end of file + todo-mysql-data: From 173b038ca4c3ac96a6acf640234aacf3c03bdc70 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:29:30 +0100 Subject: [PATCH 03/12] Update docker-compose.yml --- app/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 7ce6a64fa..9d5d27e1b 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ./:/app environment: - MYSQL_HOST: 192.168.0.13 + MYSQL_HOST: 192.168.0.13:3306 MYSQL_USER: root MYSQL_PASSWORD: secret MYSQL_DB: todos From 0c0f194e4acbe9fbb504a5729ceb3c9617c2da57 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:33:59 +0100 Subject: [PATCH 04/12] Update docker-compose.yml --- app/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 9d5d27e1b..1e839be08 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ./:/app environment: - MYSQL_HOST: 192.168.0.13:3306 + MYSQL_HOST: backend MYSQL_USER: root MYSQL_PASSWORD: secret MYSQL_DB: todos From c9f5458fe63c612e10e4f8e6954b4f9289f8a6b4 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:38:39 +0100 Subject: [PATCH 05/12] Update docker-compose.yml --- app/docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 1e839be08..8e423f2af 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -3,12 +3,12 @@ services: image: node:18-alpine command: sh -c "yarn install && yarn run dev" ports: - - 3000:3000 + - 192.168.0.12:3000:3000 working_dir: /app volumes: - ./:/app environment: - MYSQL_HOST: backend + MYSQL_HOST: 192.168.0.13 MYSQL_USER: root MYSQL_PASSWORD: secret MYSQL_DB: todos @@ -20,6 +20,8 @@ services: environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: todos + ports: + - 192.168.0.13:3306:3306 volumes: todo-mysql-data: From 15899d5080c10824276b18e0df0eae48231e913a Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:51:01 +0100 Subject: [PATCH 06/12] Create compose_front.yml --- compose_front.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 compose_front.yml diff --git a/compose_front.yml b/compose_front.yml new file mode 100644 index 000000000..acc539876 --- /dev/null +++ b/compose_front.yml @@ -0,0 +1,15 @@ +version: '3' +services: + frontend: + image: node:18-alpine + command: sh -c "yarn install && yarn run dev" + ports: + - "80:3000" + working_dir: /app + volumes: + - ./:/app + environment: + MYSQL_HOST: 192.168.0.13 + MYSQL_USER: root + MYSQL_PASSWORD: secret + MYSQL_DB: todos From 0354d3a4cbb087befde82bb2a528873ce7664709 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:51:24 +0100 Subject: [PATCH 07/12] Create compose_back.yml --- compose_back.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 compose_back.yml diff --git a/compose_back.yml b/compose_back.yml new file mode 100644 index 000000000..0eaa180e2 --- /dev/null +++ b/compose_back.yml @@ -0,0 +1,21 @@ +version: '3' +services: + backend: + image: mysql:8.0 + volumes: + - todo-mysql-data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: todos + networks: + backend-network: + ipv4_address: 192.168.0.13 + +networks: + backend-network: + ipam: + config: + - subnet: 192.168.0.0/24 + +volumes: + todo-mysql-data: From 8e8fdf7539ea021e9c66f437eab8f432c12853ef Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:56:25 +0100 Subject: [PATCH 08/12] Delete compose_back.yml --- compose_back.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 compose_back.yml diff --git a/compose_back.yml b/compose_back.yml deleted file mode 100644 index 0eaa180e2..000000000 --- a/compose_back.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3' -services: - backend: - image: mysql:8.0 - volumes: - - todo-mysql-data:/var/lib/mysql - environment: - MYSQL_ROOT_PASSWORD: secret - MYSQL_DATABASE: todos - networks: - backend-network: - ipv4_address: 192.168.0.13 - -networks: - backend-network: - ipam: - config: - - subnet: 192.168.0.0/24 - -volumes: - todo-mysql-data: From 9ff5f489745b3ff2c435263fe09689365ac6be6c Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:56:32 +0100 Subject: [PATCH 09/12] Delete compose_front.yml --- compose_front.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 compose_front.yml diff --git a/compose_front.yml b/compose_front.yml deleted file mode 100644 index acc539876..000000000 --- a/compose_front.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3' -services: - frontend: - image: node:18-alpine - command: sh -c "yarn install && yarn run dev" - ports: - - "80:3000" - working_dir: /app - volumes: - - ./:/app - environment: - MYSQL_HOST: 192.168.0.13 - MYSQL_USER: root - MYSQL_PASSWORD: secret - MYSQL_DB: todos From 477d2cd6d63bceadddf5dcee597510451a24c0e2 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:57:12 +0100 Subject: [PATCH 10/12] Create docker_front.yml --- app/docker_front.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 app/docker_front.yml diff --git a/app/docker_front.yml b/app/docker_front.yml new file mode 100644 index 000000000..acc539876 --- /dev/null +++ b/app/docker_front.yml @@ -0,0 +1,15 @@ +version: '3' +services: + frontend: + image: node:18-alpine + command: sh -c "yarn install && yarn run dev" + ports: + - "80:3000" + working_dir: /app + volumes: + - ./:/app + environment: + MYSQL_HOST: 192.168.0.13 + MYSQL_USER: root + MYSQL_PASSWORD: secret + MYSQL_DB: todos From 990ca2556794c163d047684629ac05ea86859b23 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:57:32 +0100 Subject: [PATCH 11/12] Create docker_back.yml --- app/docker_back.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/docker_back.yml diff --git a/app/docker_back.yml b/app/docker_back.yml new file mode 100644 index 000000000..0eaa180e2 --- /dev/null +++ b/app/docker_back.yml @@ -0,0 +1,21 @@ +version: '3' +services: + backend: + image: mysql:8.0 + volumes: + - todo-mysql-data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: todos + networks: + backend-network: + ipv4_address: 192.168.0.13 + +networks: + backend-network: + ipam: + config: + - subnet: 192.168.0.0/24 + +volumes: + todo-mysql-data: From eff81d49762ed9588ae3146bc2029b912f13e894 Mon Sep 17 00:00:00 2001 From: Tobias Mattsson <90158047+Klattraren@users.noreply.github.com> Date: Fri, 10 Mar 2023 12:24:28 +0100 Subject: [PATCH 12/12] Update docker-compose.yml --- app/docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 8e423f2af..1e839be08 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -3,12 +3,12 @@ services: image: node:18-alpine command: sh -c "yarn install && yarn run dev" ports: - - 192.168.0.12:3000:3000 + - 3000:3000 working_dir: /app volumes: - ./:/app environment: - MYSQL_HOST: 192.168.0.13 + MYSQL_HOST: backend MYSQL_USER: root MYSQL_PASSWORD: secret MYSQL_DB: todos @@ -20,8 +20,6 @@ services: environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: todos - ports: - - 192.168.0.13:3306:3306 volumes: todo-mysql-data: