From 8f89f236e7153d5092c29a7c84638bb35c30d1c3 Mon Sep 17 00:00:00 2001 From: cdricms <36056008+cdricms@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:37:50 +0100 Subject: [PATCH] Redirect --- backend/main.go | 5 +++++ docker-compose.dev.yaml | 13 +++++++++++++ frontend/next.config.ts | 9 +++++++++ init.sh | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 docker-compose.dev.yaml diff --git a/backend/main.go b/backend/main.go index 9d4dea3..c75fd26 100644 --- a/backend/main.go +++ b/backend/main.go @@ -18,7 +18,12 @@ func main() { if err != nil { log.Fatalf("Error loading .env file: %v", err) } + environ := os.Getenv("ENVIRONMENT") port := os.Getenv("BACKEND_DOCKER_PORT") + if environ == "DEV" { + port = os.Getenv("BACKEND_PORT") + } + http.HandleFunc("/", handler) fmt.Printf("Serving on port %s\n", port) err = http.ListenAndServe(fmt.Sprintf(":%s", port), nil) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml new file mode 100644 index 0000000..dab8763 --- /dev/null +++ b/docker-compose.dev.yaml @@ -0,0 +1,13 @@ +services: + psql: + container_name: latosa-database + image: postgres:17.2-alpine + restart: always + env_file: .env + ports: + - ${POSTGRES_PORT}:${POSTGRES_DOCKER_PORT} + volumes: + - le-data:/var/lib/postgresql/data + +volumes: + le-data: diff --git a/frontend/next.config.ts b/frontend/next.config.ts index 4119f6e..174c6b8 100644 --- a/frontend/next.config.ts +++ b/frontend/next.config.ts @@ -3,6 +3,15 @@ import type { NextConfig } from "next"; const nextConfig: NextConfig = { /* config options here */ output: "standalone", + async redirects() { + return [ + { + destination: "/api", + source: `http://localhost:${process.env.BACKEND_PORT}`, + permanent: true, + }, + ]; + }, }; export default nextConfig; diff --git a/init.sh b/init.sh index 533d10e..05604a9 100755 --- a/init.sh +++ b/init.sh @@ -1,4 +1,4 @@ #!/usr/bin/sh -printf "POSTGRES_USER=\nPOSTGRES_PASSWORD=\nPOSTGRES_DB=\n#\nDocker\ninner\nport\ncontainer\nPOSTGRES_DOCKER_PORT=5432\nBACKEND_DOCKER_PORT=3000\nFRONTEND_DOCKER_PORT=3000\nPOSTGRES_PORT=5432\nBACKEND_PORT=3001\nFRONTEND_PORT=3000\n" > .env +printf "ENVIRONMENT=DEV\nPOSTGRES_USER=\nPOSTGRES_PASSWORD=\nPOSTGRES_DB=\n#\nDocker\ninner\nport\ncontainer\nPOSTGRES_DOCKER_PORT=5432\nBACKEND_DOCKER_PORT=3000\nFRONTEND_DOCKER_PORT=3000\nPOSTGRES_PORT=5432\nBACKEND_PORT=3001\nFRONTEND_PORT=3000\n" > .env ln $(pwd)/.env $(pwd)/backend ln $(pwd)/.env $(pwd)/frontend