Merge branch 'dev' into models

Author: cbrom

.env

@@ -1,8 +1,9 @@
 STORAGE_HOST=localhost
 STORAGE_PORT=5432
 STORAGE_DBUSER=postgres
-STORAGE_DBPASSWORD="1772"
+STORAGE_DBPASSWORD=1772
 STORAGE_HANDLERNAME=postgresql
 STORAGE_URL=mongodb://localhost:27017
 STORAGE_DATABASE=go_lms
-ADDRESS=0.0.0.0:3000
+ADDRESS=0.0.0.0:3000
+REDIS_HOST=redis

Dockerfile

@@ -0,0 +1,13 @@
+FROM golang:1.14
+
+WORKDIR /Go-LMS
+
+COPY go.mod ./
+
+RUN go mod tidy
+
+RUN go mod download
+
+RUN go get github.com/githubnemo/CompileDaemon
+
+ENTRYPOINT export STORAGE_HOST=db && CompileDaemon --build="go build cmd/graphql/main.go" --command="./main"

configs/db.config.go

@@ -39,11 +39,12 @@ func LoadConfig() (*AppConfig, error) {
 	if err != nil {
 		return nil, err
 	}
-	if conf.Storage == (Storage{}) {
+	if conf.Storage.Host == "db" || conf.Storage == (Storage{}) {
 		err = godotenv.Load()
 		if err != nil {
 			return nil, err
 		}
+		
 		storage := Storage{
 			HandlerName: os.Getenv("STORAGE_HANDLERNAME"),
 			Host:        os.Getenv("STORAGE_HOST"),
@@ -53,6 +54,11 @@ func LoadConfig() (*AppConfig, error) {
 			Dbuser:      os.Getenv("STORAGE_DBUSER"),
 			Dbpassword:  os.Getenv("STORAGE_DBPASSWORD"),
 		}
+		// If running in docker-compose, we should check if STORAGE_HOST was set.
+		if conf.Storage.Host == "db" {
+			storage.Host = conf.Storage.Host
+		}
+
 		tls := TLS{
 			Key:   os.Getenv("TLS_KEY"),
 			Crt:   os.Getenv("TLS_CRT"),

configs/server.config.go

@@ -25,7 +25,7 @@ var CFG struct {
 		MaxmemoryPolicy string        `envconfig:"MAXMEMORY_POLICY"`
 	}
 	DB struct {
-		Host       string `default:"127.0.0.1:5433" envconfig:"DB_HOST"`
+		Host       string `default:"127.0.0.1:5433" envconfig:"STORAGE_HOST"`
 		User       string `default:"postgres" envconfig:"DB_HOST"`
 		Pass       string `default:"postgres" envconfig:"DB_PASS" json:"-"`
 		Database   string `default:"shared" envconfig:"DATABASE"`

docker-compose.yml

@@ -0,0 +1,53 @@
+version: '3'
+
+services:
+    db: 
+        build:
+            context: ./postgres
+            args:
+                - POSTGRES_DB=${STORAGE_DATABASE}
+                - POSTGRES_USER=${STORAGE_DBUSER}
+                - POSTGRES_PASSWORD=${STORAGE_DBPASSWORD}
+        ports:
+            - "127.0.0.1:5432:5432"
+        environment:
+            - POSTGRES_DB=${STORAGE_DATABASE}
+            - POSTGRES_USER=${STORAGE_DBUSER}
+            - POSTGRES_PASSWORD=${STORAGE_DBPASSWORD}
+        networks:
+            - pupilgo
+    redis:
+        image: "redis:alpine"
+        restart: unless-stopped
+        networks:
+            - pupilgo
+    backend:
+        build: .
+        ports:
+            - "8000:3000" 
+        restart: unless-stopped
+        depends_on: 
+            - db
+            - redis
+        volumes:
+            - ./:/Go-LMS
+        environment:
+            REDIS_URL: redis:6379   
+        networks:
+            - pupilgo
+    frontend:
+        build: ./user-interface
+        command: npm run start
+        ports: 
+            - "3000:3000"
+        depends_on:
+            - backend
+        volumes:
+            - /user-interface/node_modules
+            - ./user-interface:/user-interface
+        networks:
+            - pupilgo
+        stdin_open: true
+
+networks:
+    pupilgo:

docs/assets/go-lms-uml.png

@@ -0,0 +1,7 @@
+FROM postgres:12.3
+
+ARG POSTGRES_DB
+ARG POSTGRES_USER
+ARG POSTGRES_PASSWORD
+
+COPY load-extensions.sh /docker-entrypoint-initdb.d

postgres/Dockerfile

@@ -0,0 +1,4 @@
+psql -v ON_ERROR_STOP=1 --dbname "$POSTGRES_DB" --username "$POSTGRES_USER" <<EOF
+create extension "uuid-ossp";
+select * FROM pg_extension;
+EOF

postgres/load-extensions.sh

@@ -0,0 +1,7 @@
+FROM node:14.4 
+
+WORKDIR /user-interface/
+
+COPY package.json ./
+
+RUN npm install