Merge pull request #30 from MZC-CSC/develop

update docker and docker compose for updated structure

Author: hippo-an

Diff for: api/Dockerfile.local

@@ -1,5 +1,5 @@
 ## Stage 1 - Go Build Env
-FROM golang:1.22.3-alpine AS build
+FROM golang:1.23-alpine AS build
 
 RUN apk add --no-cache gcc libc-dev musl-dev curl npm wget
 
@@ -15,22 +15,22 @@ ENV CGO_ENABLED=1
 
 RUN mkdir -p /src/mc-web-console-api
 WORKDIR /src/mc-web-console-api
-ADD . .
+ADD ./api .
+ADD ./conf ./conf
 
 RUN go mod download
 RUN buffalo build --static -o /bin/api
 
 ## Stage 2 - Application Deploy
 FROM debian:buster-slim as deploy
 
-WORKDIR /app/
 COPY --from=build /bin/api .
-COPY --from=build /src/mc-web-console-api/conf /app/conf
+COPY --from=build /src/mc-web-console-api/conf /conf
 
 ENV API_ADDR 0.0.0.0
 ENV API_PORT 3000
 
 ENV MCIAM_USE=true
 
 EXPOSE 3000
-CMD bash -c 'until /app/api migrate; do echo "Migration failed. Retrying in 10 seconds..."; sleep 10; done; /app/api > /app/api.log 2>&1 &  tail -f /app/api.log & wait'
+CMD bash -c 'until /api migrate; do echo "Migration failed. Retrying in 10 seconds..."; sleep 10; done; /api > /api.log 2>&1 &  tail -f /api.log & wait'

Diff for: scripts/docker-compose-vue.yaml

@@ -1,10 +1,8 @@
-version: '3.9'
-
 services:
   mc-web-console-api:
     build: 
-      context: ../mc_web_console_api
-      dockerfile: Dockerfile.local
+      context: ..
+      dockerfile: api/Dockerfile.local
     container_name: mc-web-console-api
     depends_on:
       - mc-web-console-postgres
@@ -22,7 +20,7 @@ services:
 
   mc-web-console-front:
     build:
-      context: ../mc_web_console_new_front
+      context: ../front
       dockerfile: Dockerfile
     container_name: mc-web-console-front
     depends_on: