minor reorganization, docker-compose for SQL

Makefile

@@ -1,20 +1,20 @@
-build :
+build:
 ifeq ($(env), local)
 	cd frontend && npm install
 else
 	docker-compose up --build
 endif
 
-run :
+run:
 ifeq ($(env), local)
 	cd frontend && npm run dev
 else
 	docker-compose up
 endif
 
-down :
+down:
 	docker-compose down --remove-orphans
 
-prettier :
+prettier:
 	cd frontend && npx prettier --write .
-	cd frontend && npm run lint -- --fix
+	cd frontend && npm run lint -- --fix

backend/Dockerfile

@@ -2,16 +2,25 @@ FROM golang:buster
 
 RUN apt-get update
 RUN apt-get install curl
-WORKDIR /app
 
-COPY . .
+ENV PGUSER=postgres;
+ENV PGHOST=postgres;
+ENV PGPASSWORD=password;
+ENV PGDATABASE=postgres;
+
+WORKDIR /app
 
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.33.0
 RUN curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
 
+COPY go.mod .
+COPY go.sum .
+
 RUN go mod download
 RUN go mod vendor
 
+COPY . .
+
 ENV PORT=3001
 
 CMD [ "air" ]

docker-compose.yml

@@ -1,5 +1,15 @@
 version: "3.8"
 services:
+  postgres:
+    build:
+      context: ./storage
+      dockerfile: Dockerfile.db
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_PASSWORD: password
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
   frontend:
     stdin_open: true
     build:
@@ -24,4 +34,8 @@ services:
       - PORT=3001
     volumes:
       - ./backend:/app
+    links:
+      - postgres
+    depends_on: 
+      - postgres
 

storage/Dockerfile.db

@@ -0,0 +1,5 @@
+FROM postgres:13.1
+RUN apt-get update && apt-get install -y dos2unix
+COPY sql/ /docker-entrypoint-initdb.d
+RUN chmod +x /docker-entrypoint-initdb.d/build.sh
+RUN find ./docker-entrypoint-initdb.d -type f -print0 | xargs -0 -n 1 -P 4 dos2unix

storage/README.md

@@ -0,0 +1,13 @@
+# Dialog Storage
+
+## SQL
+
+The SQL scripts can be found under [sql](sql/). The custom Dockerfile builds the image, this should only be used for development purposes.
+
+## Notes
+
+All storage related files should go here, this includes but is not limited to:
+- Schema
+- Database configuration files/scripts
+- Object storage
+- Caching

storage/sql/build.sh

@@ -0,0 +1,9 @@
+cd $(dirname $0)
+
+PGUSER=postgres
+PGHOST=localhost
+PGPASSWORD=postgres
+PGDATABASE=postgres
+PGPORT=5432
+
+initilize=$(psql -f scripts/discussion-board.sql)