From 49cef31e2ea28040bf53686a1c67d808e0d7fa7f Mon Sep 17 00:00:00 2001
From: valitovgaziz <valitovgaziz@yandex.ru>
Date: Sun, 25 May 2025 16:33:28 +0300
Subject: [PATCH] chanage outterport for spa to 80, rename services

---
 .env                | 2 +-
 Makefile            | 4 ++--
 docker-compose.yaml | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index eab48e0..9bd28f0 100644
--- a/.env
+++ b/.env
@@ -18,4 +18,4 @@ GOOSE_MIGRATION_DIR=migrations
 
 # FRONTEND SPA
 INNERPORT=80
-OUTERPORT=8088
\ No newline at end of file
+OUTERPORT=80
diff --git a/Makefile b/Makefile
index cf5e6bb..71e6968 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ build:
 	@docker compose build
 
 run:
-	@docker compose up
+	@docker compose up -d --remove-orphans
 
 clean:
 	@docker builder prune
@@ -13,4 +13,4 @@ test:
 tc:
 	@go test -cover
 
-.DEFAULT_GOAL=run
\ No newline at end of file
+.DEFAULT_GOAL=run
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3204ecd..6422786 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,6 +2,7 @@ services:
 
   db:
     image: postgres:16
+    container_name: db
     env_file:
       - .env
     ports:
@@ -14,6 +15,7 @@ services:
       - POSTGRES_DB=${PGDATABASE}
     
   api:
+    container_name: api
     build:
       context: ./api
       dockerfile: Dockerfile
@@ -28,6 +30,7 @@ services:
     command: ./bin/api
 
   migrator:
+    container_name: migrator
     build:
       context: ./migrator
       dockerfile: Dockerfile
@@ -41,6 +44,7 @@ services:
     command: goose up
 
   spa:
+    container_name: spa
     build:
       context: ./spa
       dockerfile: Dockerfile
@@ -56,4 +60,4 @@ services:
 volumes:
   api:
   postgres-db:
-  goose:
\ No newline at end of file
+  goose: