diff --git a/backend/Dockerfile b/backend/Dockerfile index 6655414..ea3936c 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # Multi-stage build for multi-architecture support (AMD64, ARM64) -FROM --platform=$BUILDPLATFORM oven/bun:1-alpine AS builder +FROM --platform=$BUILDPLATFORM node:20-alpine AS builder WORKDIR /app @@ -7,13 +7,13 @@ WORKDIR /app COPY package*.json ./ # Install dependencies -RUN bun install --production +RUN npm ci --production # Copy source code COPY . . # --- Production stage --- -FROM --platform=$TARGETPLATFORM oven/bun:1-alpine +FROM --platform=$TARGETPLATFORM node:20-alpine # Install curl for health checks and other utilities RUN apk add --no-cache curl wget @@ -32,7 +32,7 @@ EXPOSE 5000 # Health check HEALTHCHECK --interval=30s --timeout=3s --start-period=40s \ - CMD bun -e "fetch('http://localhost:5000/api/health').then(r=>process.exit(r.ok?0:1))" + CMD curl -f http://localhost:5000/api/health || exit 1 # Start server -CMD ["bun", "server.js"] +CMD ["node", "server.js"] diff --git a/deploy/k8s/backend-deployment.yaml b/deploy/k8s/backend-deployment.yaml index a68d811..62e3edb 100644 --- a/deploy/k8s/backend-deployment.yaml +++ b/deploy/k8s/backend-deployment.yaml @@ -44,7 +44,7 @@ spec: containers: - name: backend # Update with your registry and tag - image: gitea-http.taildb3494.ts.net/will/adopt-a-street/backend:latest + image: gitea-gitea-http.taildb3494.ts.net/will/adopt-a-street/backend:latest imagePullPolicy: Always ports: - containerPort: 5000 diff --git a/deploy/k8s/frontend-deployment.yaml b/deploy/k8s/frontend-deployment.yaml index 7c5c28b..43402c2 100644 --- a/deploy/k8s/frontend-deployment.yaml +++ b/deploy/k8s/frontend-deployment.yaml @@ -34,7 +34,7 @@ spec: containers: - name: frontend # Update with your registry and tag - image: gitea-http.taildb3494.ts.net/will/adopt-a-street/frontend:latest + image: gitea-gitea-http.taildb3494.ts.net/will/adopt-a-street/frontend:latest imagePullPolicy: Always ports: - containerPort: 80 diff --git a/deploy/k8s/image-pull-secret.yaml b/deploy/k8s/image-pull-secret.yaml index 31ffae0..46aaa62 100644 --- a/deploy/k8s/image-pull-secret.yaml +++ b/deploy/k8s/image-pull-secret.yaml @@ -13,7 +13,7 @@ data: # 3. Apply with: kubectl apply -f image-pull-secret.yaml # 4. To generate the proper config, run: # kubectl create secret docker-registry regcred \ -# --docker-server=gitea-http.taildb3494.ts.net \ +# --docker-server=gitea-gitea-http.taildb3494.ts.net \ # --docker-username=will \ # --docker-password=YOUR_GITEA_PASSWORD \ # --namespace=adopt-a-street \