feat: prepare build script and compose files for many environments

README.md

@@ -26,24 +26,29 @@ If you would like to contribute, please have a look at our [contribution guideli
 
 -   Clone the repository
 -   `cp backend/.env.example backend/.env && cp frontend/.env.example frontend/.env`
--   Run `./build up`
--   To migrate the database to a fresh state, run `./build migrate-fresh` (you can do this while docker is running with all the services)
--   If you do not need hot reloading for the client, you can set `APP_ENV=produdction` in the `.env` files, and you will not need to run the frontend server (`yarn run dev`),
-    simply go to `localhost:8080` in your browser and the Go server will serve the frontend as well (it builds the js in docker).
-
--   If you are working on the backend, you may wish to comment out the `server` service (1st) in the `docker-compose.yml` file,
-and run `./build up`, then you can simply run `./build` to start the backend server, and when making changes you will not have
-to wait for docker to rebuild the frontend, the middleware, and start the other 4 containers each time you wish to test out
-a change. If you are developing the middleware, simply comment it out and run it separately with `go run provider-middleware/.`
-
-**If you need hot reloading for the client:**
--   Change directory to the frontend directory
--   Run `yarn install`
--   Run `yarn run dev`
--   Open `http://localhost:5173` in your browser
-
--   Login with `SuperAdmin` and password: `ChangeMe!`
--   You will be prompted immediately to set a new password, and then you will be redirected to the dashboard.
+
+**For frontend development:**
+-  Run `./build dev -f`
+
+This will build everything but the client, which you can then run separately with `yarn run dev` in the frontend directory.
+
+**For backend development:**
+
+-   Run `./build dev`
+
+This will build only the Auth and run Postgres. You are responsible for building and running the server and middleware.
+
+**For Production:**
+
+- Run `./build prod` to build the entire project in docker. You can then go to `localhost` in your browser.
+
+
+Login with `SuperAdmin` and password: `ChangeMe!`
+
+You will be prompted immediately to set a new password, and then you will be redirected to the dashboard.
+
+### To migrate the database to a fresh state, run `./build migrate-fresh` (you can do this while docker is running with all the services)
+
 
 ## Style/Linting
 

backend/go.mod

@@ -1,4 +1,4 @@
-module Go-Prototype
+module UnlockEdv2
 
 go 1.22.2
 

backend/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	server "Go-Prototype/src/handlers"
+	server "UnlockEdv2/src/handlers"
 	"fmt"
 	"net/http"
 	"os"

backend/migrations/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"Go-Prototype/src/database"
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/database"
+	"UnlockEdv2/src/models"
 	"fmt"
 	"log"
 	"os"

backend/src/database/DB.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"fmt"
 	"log"

backend/src/database/activity.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"fmt"
 	"time"
 

backend/src/database/leftmenulinks.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"log"
 )
 

backend/src/database/milestones.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 )
 
 func IsValidOrderBy(orderBy string) bool {

backend/src/database/oidc_client.go

@@ -1,6 +1,6 @@
 package database
 
-import "Go-Prototype/src/models"
+import "UnlockEdv2/src/models"
 
 func (db *DB) GetClientForProvider(provID uint) (*models.OidcClient, error) {
 	client := models.OidcClient{}

backend/src/database/outcomes.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 )
 
 func (db *DB) GetOutcomesForUser(id uint, page, perPage int) (int64, []models.Outcome, error) {

backend/src/database/programs.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 )
 
 func (db *DB) GetProgramByID(id int) (*models.Program, error) {

backend/src/database/provider_platforms.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"fmt"
 	"log"
 )

backend/src/database/provider_user_mappings.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"errors"
 )
 

backend/src/database/user_activity.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 )
 
 type UserAcitivityJoin struct {

backend/src/database/users.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"errors"
 
 	log "github.com/sirupsen/logrus"

backend/src/handlers/actions.go

@@ -1,8 +1,8 @@
 package handlers
 
 import (
-	"Go-Prototype/src"
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src"
+	"UnlockEdv2/src/models"
 	"net/http"
 	"strconv"
 

backend/src/handlers/activity_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/left_menu_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 

backend/src/handlers/milestones_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/oidc.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"os"

backend/src/handlers/outcomes_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/programs_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/provider_platform_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/provider_user_mapping_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"net/http"
 	"strconv"

backend/src/handlers/server.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	database "Go-Prototype/src/database"
+	database "UnlockEdv2/src/database"
 	"context"
 	"encoding/json"
 	"math"

backend/src/handlers/user_activity_handler.go

@@ -1,8 +1,8 @@
 package handlers
 
 import (
-	"Go-Prototype/src/database"
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/database"
+	"UnlockEdv2/src/models"
 	"net/http"
 	"strconv"
 	"strings"

backend/src/handlers/user_handler.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"encoding/json"
 	"fmt"
 	"net/http"

backend/src/service.go

@@ -1,7 +1,7 @@
 package src
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"bytes"
 	"encoding/json"
 	"errors"

backend/tests/main_test.go

@@ -1,7 +1,7 @@
 package tests
 
 import (
-	"Go-Prototype/src/handlers"
+	"UnlockEdv2/src/handlers"
 	"os"
 	"testing"
 )

backend/tests/provider_platform_handler_test.go

@@ -1,7 +1,7 @@
 package tests
 
 import (
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/models"
 	"bytes"
 	"encoding/json"
 	"net/http"

backend/tests/user_handler_test.go

@@ -1,8 +1,8 @@
 package tests
 
 import (
-	"Go-Prototype/src/handlers"
-	"Go-Prototype/src/models"
+	"UnlockEdv2/src/handlers"
+	"UnlockEdv2/src/models"
 	"bytes"
 	"encoding/json"
 	"fmt"

build

@@ -1,23 +1,22 @@
 #!/bin/bash
 
-help="Usage: ./build up | migrate-fresh | server"
+help="Usage: ./build prod | dev [-f] | migrate-fresh"
 
-if [[ "$1" == "-h" ]]; then
-	echo "$help"
+if [[ "$1" == "prod" ]]; then
+	docker compose -f docker-compose.yml -f config/docker-compose.prod.yml up --build
 	exit 0
 fi
 
-if [[ "$1" == "up" ]]; then
-	docker-compose up -d --build
-	echo "Building backend..."
+if [[ "$1" == "dev" ]]; then
+	if [[ "$2" == "-f" ]]; then
+		docker compose -f docker-compose.yml -f config/docker-compose.fe-dev.yml up --build
+	else
+		docker compose up
+	fi
 fi
 
 if [[ "$1" == "migrate-fresh" ]]; then
 	go run backend/migrations/main.go
 fi
 
-if [[ "$1" == "server" ]]; then
-	go run backend/main.go
-fi
-
 exit 0

config/docker-compose.fe-dev.yml

@@ -0,0 +1,43 @@
+services:
+  server:
+    build:
+      context: .
+      dockerfile: ./backend/Dockerfile
+    environment:
+      - APP_ENV=production
+      - DB_HOST=postgres
+      - DB_PORT=5432
+      - DB_USER=unlocked
+      - DB_PASSWORD=dev
+      - DB_NAME=unlocked
+      - PROVIDER_SERVICE_URL=http://provider-service:8081
+      - HYDRA_ADMIN_URL=http://hydra:4445
+      - HYDRA_PUBLIC_URL=http://hydra:4444
+    ports:
+      - "8080:8080"
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - "./backend/.env"
+    command: >
+      ./backend
+    volumes:
+      - ./logs:/logs/
+    networks:
+      - intranet
+
+  # Provider middleware
+  provider-service:
+    build:
+      context: ./provider-middleware
+      dockerfile: Dockerfile
+    env_file: "./backend/.env"
+    command: ./provider-service
+    networks:
+      - intranet
+    volumes:
+      - ./logs:/logs
+    depends_on:
+      postgres:
+        condition: service_healthy