Merge pull request #4 from python/cabotage_from_subdirectories

deploy from subdirectories

Author: ewdurbin

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.13-slim-bookworm
 
 WORKDIR /app
 
@@ -33,4 +33,4 @@ HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:${API_PORT}/health || exit 1
 
 # Run the application
-CMD ["sh", "-c", "python -m uvicorn app.main:app --host ${API_HOST} --port ${API_PORT}"]
+CMD ["sh", "-c", "python -m uvicorn app.main:app --host ${API_HOST} --port ${API_PORT}"]

Procfile

@@ -0,0 +1,2 @@
+web: python -m uvicorn app.main:app --uds /var/run/cabotage/cabotage.sock
+release: echo 'doin deploy things'

backend/Dockerfile

@@ -1,8 +1,7 @@
-FROM node:18-alpine AS base
+FROM node:18-bookworm AS base
 
 # Install dependencies only when needed
 FROM base AS deps
-RUN apk add --no-cache libc6-compat wget
 WORKDIR /app
 
 # Copy package files
@@ -23,12 +22,16 @@ ENV NEXT_PUBLIC_API_BASE=$NEXT_PUBLIC_API_BASE
 RUN npm run build
 
 # Production image, copy all the files and run next
-FROM base AS runner
+FROM python:3.13-slim-bookworm AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production
 
-RUN apk add --no-cache wget
+RUN apt-get update && apt-get install -y \
+    wget \
+    socat \
+    nodejs \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
@@ -44,6 +47,8 @@ RUN chown nextjs:nodejs .next
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
+COPY ./scripts ./scripts
+
 USER nextjs
 
 EXPOSE 3000
@@ -55,4 +60,4 @@ ENV HOSTNAME="0.0.0.0"
 HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://localhost:3000/ || exit 1
 
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]

backend/Procfile

@@ -0,0 +1,2 @@
+web: ./scripts/start-frontend
+release: echo 'doin deploy things'