Fixes docker config and adds gin router

Author: Aryan51203

.dockerignore

@@ -0,0 +1,22 @@
+# Build artifacts
+build/
+vendor/
+
+# Development files
+.env
+*.log
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Docker files
+Dockerfile*
+docker-compose*.yaml
+dev.sh 

.gitignore

@@ -13,15 +13,13 @@
 
 # Dependency directories (remove the comment below to include it)
 vendor/
-v1.46.2/
 
 # Exclude the binary
 nymeria
 !nymeria/
 
 # Exclude the config file
 config.yaml
-/config/kratos.yml
 
 # miscellaneous
 .vscode/
@@ -37,4 +35,8 @@ target/
 
 config.docker.yaml
 
-logs
+logs
+
+.env
+
+.DS_Store

Dockerfile

@@ -1,15 +1,24 @@
-FROM golang:1.23-alpine 
+FROM golang:1.23-alpine AS base
 
 WORKDIR /app
 
-COPY . /app/
+ENV GOPROXY=direct
 
-RUN export GOPROXY=direct
+RUN apk add --no-cache make postgresql-client git curl
 
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Development Mode
+FROM base AS dev
+COPY . .
+RUN make install-tools
 EXPOSE 9898
+CMD ["make", "dev"]
 
-# install make, psql
-RUN apk add --no-cache make postgresql-client
+# Production Mode
+FROM base AS prod
+COPY . .
 RUN make build
-
-CMD ["./nymeria"]
+EXPOSE 9898
+CMD ["./build/nymeria"]

Makefile

@@ -57,17 +57,19 @@ test-short:
 install-tools: install-golangci-lint install-goimports install-air
 
 install-golangci-lint:
+	@echo "Installing golangci-lint..."
 	@if [ ! -f $(GOLANGCI_LINT) ]; then \
-		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
-		sh -s -- -b $(GOPATH_BIN) v2.1.6; \
+		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(GOPATH_BIN) v2.1.6; \
 	fi
 
 install-goimports:
+	@echo "Installing goimports..."
 	@if [ ! -f $(GOIMPORTS) ]; then \
 		$(GO) install golang.org/x/tools/cmd/goimports@latest; \
 	fi
 
 install-air:
+	@echo "Installing air..."
 	@if [ ! -f $(AIR) ]; then \
 		curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh | sh -s -- -b $(GOPATH_BIN); \
 	fi

dev.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Development environment runner script
+echo "🚀 Starting development environment..."
+
+# Build and run with docker-compose dev configuration
+docker-compose -f docker-compose.dev.yaml up --build --force-recreate
+
+# Cleanup function
+cleanup() {
+    echo "🧹 Cleaning up..."
+    docker-compose -f docker-compose.dev.yaml down
+}
+
+# Set trap to cleanup on script exit
+trap cleanup EXIT 

docker-compose.dev.yaml

@@ -0,0 +1,34 @@
+services:
+  app:
+    build: 
+      context: .
+      target: dev
+    ports:
+      - "9898:9898"
+    depends_on:
+      - db
+    environment:
+      - DB_HOST=db
+      - DB_USER=${DB_USER:-nymeria}
+      - DB_PASS=${DB_PASS:-password}
+      - DB_NAME=${DB_NAME:-nymeria}
+      - DB_PORT=5432
+    volumes:
+      - .:/app
+    command: ["make", "dev"]
+    restart: unless-stopped
+
+  db:
+    image: postgres:15-alpine
+    volumes:
+      - postgres_data_dev:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${DB_USER:-nymeria}
+      - POSTGRES_PASSWORD=${DB_PASS:-password}
+      - POSTGRES_DB=${DB_NAME:-nymeria}
+    ports:
+      - "5432:5432"
+    restart: unless-stopped
+
+volumes:
+  postgres_data_dev: 

docker-compose.prod.yaml

@@ -0,0 +1,31 @@
+services:
+  app:
+    build: 
+      context: .
+      target: prod
+    ports:
+      - "9898:9898"
+    depends_on:
+      - db
+    environment:
+      - DB_HOST=db
+      - DB_USER=${DB_USER:-nymeria}
+      - DB_PASS=${DB_PASS:-password}
+      - DB_NAME=${DB_NAME:-nymeria}
+      - DB_PORT=5432
+    restart: unless-stopped
+
+  db:
+    image: postgres:15-alpine
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${DB_USER:-nymeria}
+      - POSTGRES_PASSWORD=${DB_PASS:-password}
+      - POSTGRES_DB=${DB_NAME:-nymeria}
+    ports:
+      - "5432:5432"
+    restart: unless-stopped
+
+volumes:
+  postgres_data:

docker-compose.yaml

@@ -2,38 +2,55 @@ module github.com/sdslabs/nymeria
 
 go 1.23.0
 
-toolchain go1.24.0
-
 require (
-	github.com/go-chi/chi/v5 v5.2.1
-	github.com/go-chi/cors v1.2.1
+	github.com/gin-contrib/cors v1.7.5
+	github.com/gin-gonic/gin v1.10.1
 	github.com/rs/zerolog v1.34.0
 	github.com/stretchr/testify v1.10.0
 	gorm.io/gorm v1.30.0
 )
 
 require (
+	github.com/bytedance/sonic v1.13.2 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.6.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
 	golang.org/x/sync v0.15.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )
 
 require (
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/go-chi/chi v1.5.5
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.5.0
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.26.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect