test

backend/Dockerfile

@@ -5,6 +5,10 @@ WORKDIR /app
 
 # Copy go.mod and go.sum files to download dependencies
 COPY go.mod go.sum ./
+
+# Install the C compiler (gcc) and other build tools needed for CGO
+RUN apk add --no-cache build-base
+
 RUN go mod download
 
 # Copy the rest of the application source code
@@ -13,7 +17,7 @@ COPY . .
 # Build the application
 # CGO_ENABLED=0 is important for a clean static build for Alpine
 # -o main specifies the output file name
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main .
+RUN CGO_ENABLED=1 go build -o main .
 
 # Stage 2: Create the final lightweight image
 FROM alpine:latest

docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  backend:
+    image: git.out.jafre.li/jafreli/dashboard-backend:latest
+    container_name: dashboard-backend
+    # ports:
+    #   - "8080:8080"
+    restart: unless-stopped
+    volumes:
+      - ./data/dashboard.db:/root/dashboard.db
+
+  frontend:
+    image: git.out.jafre.li/jafreli/dashboard-frontend:latest
+    container_name: dashboard-frontend
+    ports:
+      - "80:80"
+    restart: unless-stopped
+    depends_on:
+      - backend
+

frontend/Dockerfile

@@ -15,6 +15,9 @@ COPY . .
 # The output will be in the /app/dist/ directory
 RUN npm run build
 
+# Debugging: List the contents of the build output directory
+RUN ls -laR /app/dist/frontend
+
 # Stage 2: Serve the application with Nginx
 FROM nginx:alpine
 
@@ -24,9 +27,12 @@ RUN rm /etc/nginx/conf.d/default.conf
 # Copy the custom Nginx configuration from the local machine
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 
+# Remove default Nginx welcome page
+RUN rm -rf /usr/share/nginx/html/*
+
 # Copy the built application from the builder stage to Nginx's web root directory
 # I am assuming the project name is 'dashboard'. If not, you may need to change the path 'dist/dashboard/browser'.
-COPY --from=builder /app/dist/frontend /usr/share/nginx/html
+COPY --from=builder /app/dist/frontend/ /usr/share/nginx/html
 
 # Expose port 80 for the web server
 EXPOSE 80

frontend/nginx.conf

@@ -13,4 +13,17 @@ server {
     # This is the key for making client-side routing work.
     try_files $uri $uri/ /index.html;
   }
+
+  # Add a new location block to proxy API requests
+  location /api/ {
+    # Forward the request to the backend service.
+    # The name 'backend' is resolved by Docker's internal DNS.
+    proxy_pass http://backend:8080;
+
+    # Set headers to pass along client information to the backend
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+  }
 }

frontend/src/app/services/api.ts

@@ -7,7 +7,7 @@ import { Item } from '../models/item';
   providedIn: 'root'
 })
 export class ApiService {
-  private apiUrl = 'http://localhost:8080/api/items';
+  private apiUrl = '/api/items';
 
   constructor(private http: HttpClient) { }