From bbc2b8a3960e89e65d506f2f59429481779b9dfc Mon Sep 17 00:00:00 2001
From: AdsonCicilioti <eu@adsonagencia.com>
Date: Sat, 26 Aug 2023 00:29:58 -0300
Subject: [PATCH 1/3] clean: declarative bridge network instead shellscript
 check

---
 docker-compose.yaml.example           | 4 ++--
 docker-compose.yaml.example.complete  | 4 ++--
 docker-compose.yaml.example.dockerhub | 4 ++--
 docker.sh                             | 9 +--------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example
index 93e04cc0..b3981999 100644
--- a/docker-compose.yaml.example
+++ b/docker-compose.yaml.example
@@ -24,5 +24,5 @@ volumes:
 
 networks:
   evolution-net:
-    external: true
-  
\ No newline at end of file
+    name: evolution-net
+    driver: bridge
diff --git a/docker-compose.yaml.example.complete b/docker-compose.yaml.example.complete
index 4e453b51..790c6289 100644
--- a/docker-compose.yaml.example.complete
+++ b/docker-compose.yaml.example.complete
@@ -75,5 +75,5 @@ volumes:
 
 networks:
   evolution-net:
-    external: true
-  
\ No newline at end of file
+    name: evolution-net
+    driver: bridge
diff --git a/docker-compose.yaml.example.dockerhub b/docker-compose.yaml.example.dockerhub
index 6136997d..562d1b07 100644
--- a/docker-compose.yaml.example.dockerhub
+++ b/docker-compose.yaml.example.dockerhub
@@ -24,5 +24,5 @@ volumes:
 
 networks:
   evolution-net:
-    external: true
-  
\ No newline at end of file
+    name: evolution-net
+    driver: bridge
diff --git a/docker.sh b/docker.sh
index d72e56dd..579312b3 100755
--- a/docker.sh
+++ b/docker.sh
@@ -1,13 +1,6 @@
 #!/bin/bash
-
-NET='evolution-net'
 IMAGE='evolution/api:local'
 
-if !(docker network ls | grep ${NET} > /dev/null)
-then
-  docker network create -d bridge ${NET}
-fi
-
 docker build -t ${IMAGE} .
 
-docker compose up -d
\ No newline at end of file
+docker compose up -d

From c9721d7bc9c623dc943a15e6e924330d5b3d7b9a Mon Sep 17 00:00:00 2001
From: AdsonCicilioti <eu@adsonagencia.com>
Date: Sat, 26 Aug 2023 02:36:45 -0300
Subject: [PATCH 2/3] clean: `docker build` will be remove in future releases /
 build into compose file

---
 docker-compose.yaml.example          | 1 +
 docker-compose.yaml.example.complete | 1 +
 docker.sh                            | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100755 docker.sh

diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example
index b3981999..d0a75a5d 100644
--- a/docker-compose.yaml.example
+++ b/docker-compose.yaml.example
@@ -4,6 +4,7 @@ services:
   api:
     container_name: evolution_api
     image: evolution/api:local
+    build: .
     restart: always
     ports:
       - 8080:8080
diff --git a/docker-compose.yaml.example.complete b/docker-compose.yaml.example.complete
index 790c6289..de13de57 100644
--- a/docker-compose.yaml.example.complete
+++ b/docker-compose.yaml.example.complete
@@ -4,6 +4,7 @@ services:
   api:
     container_name: evolution_api
     image: evolution/api:local
+    build: .
     restart: always
     ports:
       - 8080:8080
diff --git a/docker.sh b/docker.sh
deleted file mode 100755
index 579312b3..00000000
--- a/docker.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-IMAGE='evolution/api:local'
-
-docker build -t ${IMAGE} .
-
-docker compose up -d

From adb43ec5b3b041e835c764f3e2ae53778c54416c Mon Sep 17 00:00:00 2001
From: AdsonCicilioti <eu@adsonagencia.com>
Date: Sat, 26 Aug 2023 02:53:02 -0300
Subject: [PATCH 3/3] clean: correct docker network declaration

---
 Docker/mongodb/docker-compose.yaml |  5 +++--
 Docker/redis/docker-compose.yaml   | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Docker/mongodb/docker-compose.yaml b/Docker/mongodb/docker-compose.yaml
index 698ca50c..01220c54 100644
--- a/Docker/mongodb/docker-compose.yaml
+++ b/Docker/mongodb/docker-compose.yaml
@@ -35,7 +35,8 @@ volumes:
   evolution_mongodb_data:
   evolution_mongodb_configdb:
 
+
 networks:
   evolution-net:
-    external: true
-    
\ No newline at end of file
+    name: evolution-net
+    driver: bridge
diff --git a/Docker/redis/docker-compose.yaml b/Docker/redis/docker-compose.yaml
index b0bb5985..297b11db 100644
--- a/Docker/redis/docker-compose.yaml
+++ b/Docker/redis/docker-compose.yaml
@@ -5,17 +5,17 @@ services:
     image: redis:latest
     container_name: redis
     command: >
-      redis-server
-      --port 6379
-      --appendonly yes
+      redis-server --port 6379 --appendonly yes
     volumes:
       - evolution_redis:/data
     ports:
       - 6379:6379
-    
+
 volumes:
   evolution_redis:
 
+
 networks:
   evolution-net:
-    external: true
+    name: evolution-net
+    driver: bridge