Fixing issue 2582 and adding mongo version (#2584)

Co-authored-by: Claudia Maia <claudia.maia@g.globo>
tsuru · Oct 19, 2022 · d793149 · d793149
1 parent a29918e
commit d793149
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -117,13 +117,20 @@ local-mac:
 	minikube start --driver=virtualbox
 	minikube addons enable registry
 	docker run -d --rm --network=host alpine ash -c "apk add socat && socat TCP-LISTEN:5000,reuseaddr,fork TCP:$(minikube ip):5000"
-	docker-compose up -d
-	go build -o $(TSR_BIN) $(TSR_SRC)
-	$(TSR_BIN) api -c ./etc/tsuru-local.conf
+	@make local-api
+
+local-mac-m1:
+	minikube start --driver=docker --alsologtostderr
+	minikube addons enable registry
+	docker run -d --rm --network=host alpine ash -c "apk add socat && socat TCP-LISTEN:5000,reuseaddr,fork TCP:$(minikube ip):5000"
+	@make local-api
 
 local:
 	minikube start --driver=none
+	@make local-api
+
+local-api:
 	docker-compose up -d
 	go build -o $(TSR_BIN) $(TSR_SRC)
 	$(TSR_BIN) api -c ./etc/tsuru-local.conf
-	
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
     mongo:
-        image: mongo
+        image: mongo:4
         volumes:
             - ./data/mongo:/data/db
         ports:
@@ -19,4 +19,4 @@ services:
         depends_on:
             - redis
         ports:
-            - "8989:8989"
+            - "8989:8989"