Merge pull request #28 from aesrael/dockerize-app

Dockerize app

Author: aesrael

.gitignore

@@ -1,2 +1,2 @@
-Makefile
-.vscode
+.vscode
+main

Makefile

@@ -0,0 +1,13 @@
+# Build go binary.
+build-go:
+	cd ./server && make build
+
+run: build-go
+	cd server/cmd && ./main & cd ../ui/ && yarn && yarn start
+
+# Build images and run
+docker-build:
+	docker-compose build
+
+docker-run:
+	docker-compose --env-file ./server/.env up 

README.md

@@ -20,19 +20,15 @@ setup your postgres database, enter your config secrets in the [.env](./server/.
 - [Installing PostgreSQL for Mac, Linux, and Windows](https://medium.com/@dan.chiniara/installing-postgresql-for-windows-7ec8145698e3)
 
 ```bash
-cd server
-go mod download
-go run main.go
+make build-go
 ```
 
 This will start the go server.
 
 To start the react app navigate to the client directory
 
 ```bash
-cd client
-yarn install
-yarn start
+make build-go
 ```
 ### Using docker
 using docker compose 

client/.eslintrc.json

@@ -0,0 +1,31 @@
+# Docker Compose file Reference (https://docs.docker.com/compose/compose-file/)
+version: '3'
+
+services:
+  server:
+    build:
+      context: ./server
+      dockerfile: Dockerfile
+    ports:
+      - '8081:8081'
+    restart: unless-stopped
+    depends_on:
+      - db
+    environment:
+      POSTGRES_SERVER_HOST: db
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_DB: ${POSTGRES_DB}
+
+  ui:
+    build:
+      context: ./ui
+      dockerfile: Dockerfile
+    ports:
+      - '3000:3000'
+    restart: unless-stopped
+
+  db:
+    image: postgres:11.2-alpine
+    restart: unless-stopped
+    ports:
+      - '5432:5432'

client/dockerfile

@@ -1,6 +1,6 @@
-DB_USER=aesrael
-DB_PASSWORD=""
-DB_NAME=goapp
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=""
+POSTGRES_DB=postgres
 CLIENT_URL=http://localhost:3000
 SERVER_PORT=:8081
 JWT_KEY=secretive

client/src/pages/Session.jsx

@@ -0,0 +1,9 @@
+
+# Build go binary.
+build:
+	cd cmd && go build -o main .
+
+run:
+	cd cmd && ./main
+
+build-run: build run