Pull Request de Juan Camargo

Makefile

@@ -0,0 +1,14 @@
+.PHONY: all up down
+
+all: up
+
+up:
+	cd services/reader && \
+	go mod init github.com/PicPay/picpay-jr-devops-challenge/services/go && \
+	go get ./... && \
+	docker-compose up -d --build
+
+down:
+	cd services/reader && \
+	rm -f go.mod go.sum && \
+	docker-compose down

README_JUAN.md

@@ -0,0 +1,36 @@
+# Docker Compose
+- Nome "redis" estava errado
+- Adicionar a network ```frontend```
+- Resolver network dos serviços
+- Aadicionar ```hostname``` e ```container_name```
+- Resolver portas iguais pelos containers
+- Adicionar ```depends_on``` para assegurar o funcionamento das aplicações
+
+# Frontend
+- Dockerfile - Adicionar ```ADD . /app```
+
+# Writer
+- Dockerfile - Instalar dependencia do redis ```RUN pip install redis```
+- Dockerfile - Trocar comando inicial ```CMD [ "python", "./main.py" ]```
+
+# Reader
+- Gerar os requisitos com ```go mod init``` e ```go get ./...``` (feito automaticamente com o Makefile)
+- Dockerfile - Instalar modulos ```RUN go mod download```
+- Dockerfile - Gerar o executavel ```RUN go build -o main .```
+- Dockerfile - Executar o arquivo gerado ```CMD ["/go/src/github.com/PicPay/picpay-jr-devops-challenge/services/go/main"]```
+
+## Reader -Aplicação - Erro ao pegar o valor no Redis, resolvido com ajustes no código:
+```
+key, err := client.Get("SHAREDKEY").Result()
+if err != nil {
+    panic(err)
+}
+fmt.Fprintf(writer, key)
+```
+
+# Usage
+- Subir os serviços ```make up```
+- Matar os serviços ```make down```
+
+# Chart
+![Organograma](https://i.imgur.com/kPxydAv.png "Organograma")

docker-compose.yaml

@@ -2,25 +2,42 @@ version: "3.9"
 services:
   web:
     build: services/frontend
+    hostname: frontend
+    container_name: frontend
     ports:
       - "5000:5000"
     networks:
       - frontend
       - backend
   reader:
     build: services/reader
+    hostname: reader
+    container_name: reader
     ports:
-      - "8081:8081"
+      - "8080:8080"
+    depends_on:
+      - redis
     networks:
-      - frontend
+      - backend
   writer:
     build: services/writer
+    hostname: writer
+    container_name: writer
     ports:
-      - "8080:8080"
+      - "8081:8081"
+    depends_on:
+      - redis
     networks:
       - backend
-  reids:
+  redis:
     image: "redis:alpine"
+    hostname: redis
+    container_name: redis
+    ports:
+      - "6379:6379"
+    networks:
+      - backend
 
 networks:
   backend:
+  frontend:

services/frontend/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:latest
 WORKDIR /app
-ADD . .
+ADD . /app
 RUN npm install -g serve
 EXPOSE 5000
 CMD "serve"

services/reader/Dockerfile

@@ -1,6 +1,7 @@
 FROM golang:1.16
 WORKDIR /go/src/github.com/PicPay/picpay-jr-devops-challenge/services/go
 ADD . /go/src/github.com/PicPay/picpay-jr-devops-challenge/services/go
-
+RUN go mod download
+RUN go build -o main .
 EXPOSE 8080
-CMD ["go","run","main.go"]
+CMD ["/go/src/github.com/PicPay/picpay-jr-devops-challenge/services/go/main"]

services/reader/main.go

@@ -24,8 +24,11 @@ func main() {
 
     mux.HandleFunc("/data", func(writer http.ResponseWriter, request *http.Request) {
         client := redis.NewClient(&redis.Options{Addr: redis_host+":"+redis_port})
-        key := client.Get(client.Context(),"SHAREDKEY")
-        fmt.Fprintf(writer, key.Val())
+        key, err := client.Get("SHAREDKEY").Result()
+        if err != nil {
+            panic(err)
+        }
+        fmt.Fprintf(writer, key)
     })
 
     handler := cors.New(cors.Options{

services/writer/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.9
 WORKDIR /app
 ADD . /app
+RUN pip install redis
 EXPOSE 8081
-CMD ["python"]
-ENTRYPOINT ["main.py"]
+CMD [ "python", "./main.py" ]