feat: add development container via compose

matyasjay · matyasjay · commit d0af8b051623 · 2025-05-27T20:41:50.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,4 @@
 !.env.*
 .env.keys
+!frontend/dist
+node_modules
diff --git a/Makefile b/Makefile
@@ -1,3 +1,10 @@
+dev:
+	sh scripts/package/dev.sh
+	sh scripts/package/tail.sh
+
+tail:
+	sh scripts/package/tail.sh
+
 sign:
 	sh scripts/git/sign.sh
 
diff --git a/docker/Dockerfile.frontend b/docker/Dockerfile.frontend
@@ -5,23 +5,15 @@ RUN mv /root/.local/share/pnpm/pnpm /usr/bin/
 
 WORKDIR /usr/src/app
 
-COPY .env.production ./
-COPY frontend/package.json ./
-COPY frontend/pnpm-lock.yaml ./
-COPY frontend/public ./public
-COPY frontend/dist ./dist
+COPY . .
 
-RUN pnpm install --prod
+RUN pnpm install --prod --force
 
 FROM node:22.12-alpine3.20 AS runner
 
-RUN apk --no-cache add curl
-RUN curl -sfS https://dotenvx.sh/install.sh | sh
-
 WORKDIR /usr/src/app
 
 COPY --from=deps /usr/bin/pnpm /usr/bin/
-COPY --from=deps /usr/src/app/.env.production ./
 COPY --from=deps /usr/src/app/node_modules ./node_modules
 COPY --from=deps /usr/src/app/public ./public
 COPY --from=deps /usr/src/app/dist ./dist
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -0,0 +1,26 @@
+name: instructor-local-dev
+version: "3.8"
+services:
+  frontend:
+    build:
+      context: ../frontend
+      dockerfile: ../docker/Dockerfile.frontend
+    ports:
+      - "3001:3000"
+    depends_on:
+      - backend
+    networks:
+      - app-network
+
+  backend:
+    build:
+      context: ../http
+      dockerfile: ../docker/Dockerfile.backend
+    ports:
+      - "3333:3333"
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
diff --git a/frontend/index.html b/frontend/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en" class="light">
   <head>
     <meta charset="UTF-8" />
diff --git a/frontend/src/app/error.tsx b/frontend/src/app/error.tsx
@@ -6,10 +6,12 @@ function ErrorDisplay({
   error?: Error;
   resetErrorBoundary?: () => void;
 }) {
+  const displayError =
+    error ?? Object(error).response?.data ?? "Unknown error!";
   return (
     <div role="alert">
       <p>Something went wrong:</p>
-      <pre style={{ color: "red" }}>{error.message}</pre>
+      <pre style={{ color: "red" }}>{JSON.stringify(displayError)}</pre>
     </div>
   );
 }
diff --git a/frontend/src/app/product/component.tsx b/frontend/src/app/product/component.tsx
@@ -1,5 +1,5 @@
 import { use } from "react";
-import { client } from "../../../lib/http";
+import { client } from "@/lib/http";
 
 const promise = client.get("/");
 
diff --git a/frontend/src/app/product/index.tsx b/frontend/src/app/product/index.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import { Suspense } from "react";
 import Component from "./component";
 
diff --git a/frontend/src/global.css b/frontend/src/global.css
@@ -1,6 +1,5 @@
 @import "tailwindcss";
 @import "./fonts.css";
-@import "tailwind/preflight";
 
 @tailwind utilities;
 
diff --git a/frontend/src/lib/http.ts b/frontend/src/lib/http.ts
@@ -3,5 +3,4 @@ import axios from "axios";
 export const client = axios.create({
   method: "GET",
   baseURL: "http://localhost:3333",
-  headers: { "Access-Control-Allow-Origin": "*" },
 });
diff --git a/http/cmd/api-server/main.go b/http/cmd/api-server/main.go
@@ -28,36 +28,36 @@ func main() {
 		AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 	}))
 
-  e.OPTIONS("/*", func(c echo.Context) error {
-    return c.NoContent(http.StatusOK)
-  })
+	e.OPTIONS("/*", func(c echo.Context) error {
+		return c.NoContent(http.StatusOK)
+	})
 
 	e.GET("/", func(c echo.Context) error {
 		psqlInfo := fmt.Sprintf("host=%s port=%d user=%s "+
-		"password=%s dbname=%s sslmode=disable",
-		host, port, user, password, dbname)
+			"password=%s dbname=%s sslmode=disable",
+			host, port, user, password, dbname)
 
 		db, err := sql.Open("postgres", psqlInfo)
 
 		if err != nil {
-			panic(err)
+			return c.JSON(http.StatusServiceUnavailable, err)
 		}
 
 		rows, err := db.Query("SELECT id, name FROM users")
 
 		if err != nil {
-			panic(err)
+			return c.JSON(http.StatusInternalServerError, err)
 		}
 
 		defer func() {
 			if cerr := rows.Close(); cerr != nil {
-				fmt.Printf("error closing DB: %v\n", cerr)
+				fmt.Printf("Error closing DB: %v\n", cerr)
 			}
 		}()
 
 		defer func() {
 			if cerr := db.Close(); cerr != nil {
-				fmt.Printf("error closing DB: %v\n", cerr)
+				fmt.Printf("Error closing DB: %v\n", cerr)
 			}
 		}()
 
@@ -68,6 +68,11 @@ func main() {
 		return c.String(http.StatusOK, "ok")
 	})
 
+	port := os.Getenv("HTTP_PORT")
+
+	if port == "" {
+		port = "3333"
+	}
 
-	e.Logger.Fatal(e.Start(":" + os.Getenv("HTTP_PORT")))
+	e.Logger.Fatal(e.Start(":" + port))
 }
diff --git a/scripts/package/dev.sh b/scripts/package/dev.sh
@@ -0,0 +1,12 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+echo "\n${F_BOLD}Initiating development containers${NO_FORMAT}${C_GREY46}\n"
+docker-compose -f docker/docker-compose.yml up --build -d
+
+
diff --git a/scripts/package/tail.sh b/scripts/package/tail.sh
@@ -0,0 +1,11 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+echo "\n${F_BOLD}Tail development container${NO_FORMAT}${C_GREY46}\n"
+docker-compose -f docker/docker-compose.yml logs -f --timestamps --no-log-prefix
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!doctype html>`
	`1`	`+<!DOCTYPE html>`
`2`	`2`	`<html lang="en" class="light">`
`3`	`3`	`<head>`
`4`	`4`	`<meta charset="UTF-8" />`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-"use client";`
`2`		`-`
`3`	`1`	`import { Suspense } from "react";`
`4`	`2`	`import Component from "./component";`
`5`	`3`