cleaned up multi-service compose

client/Dockerfile

@@ -1,40 +1,51 @@
 # Install dependencies only when needed
-FROM node:16-alpine AS deps
+FROM node:17-alpine AS deps
+
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
+
 WORKDIR /app
+
 COPY package.json yarn.lock ./
+
 RUN yarn install --frozen-lockfile
 
 # If using npm with a `package-lock.json` comment out above and use below instead
 # COPY package.json package-lock.json ./ 
 # RUN npm ci
 
 # Rebuild the source code only when needed
-FROM node:16-alpine AS builder
+FROM node:17-alpine AS builder
+
 WORKDIR /app
+
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line in case you want to disable telemetry during the build.
-ENV NEXT_TELEMETRY_DISABLED 1
-ARG API_URL http://localhost:3000
-ARG SECRET_KEY secret
+ARG SECRET_KEY
+ARG API_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV SECRET_KEY=${SECRET_KEY:-secret}
+ENV API_URL=${API_URL:-http://localhost:3000}
 
 RUN yarn build
 
 # If using npm comment out above and use below instead
 # RUN npm run build
 
 # Production image, copy all the files and run next
-FROM node:16-alpine AS runner
+FROM node:17-alpine AS runner
+
 WORKDIR /app
 
-ENV NODE_ENV production
+ARG NODE_ENV
 
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV NODE_ENV=${NODE_ENV:-production}
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs

docker-compose.yml

@@ -3,7 +3,8 @@ services:
     build:
       context: ./server
       args:
-        SECRET_KEY: secret
+        - SECRET_KEY=secret
+        - NODE_ENV=production
     container_name: server
     restart: unless-stopped
     user: 1000:1000
@@ -16,13 +17,13 @@ services:
     build:
       context: ./client
       args:
-        API_URL: http://localhost:3000
-        SECRET_KEY: secret
+        - API_URL=http://server:3000
+        - SECRET_KEY=secret
     container_name: client
     restart: unless-stopped
     user: 1000:1000
     environment:
-      - API_URL=http://localhost:3000
+      - API_URL=http://server:3000
       - SECRET_KEY=secret
     ports:
       - "3001:3001"

server/Dockerfile

@@ -1,30 +1,43 @@
 # Install dependencies only when needed
-FROM node:16-alpine AS deps
+FROM node:17-alpine AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat git
+
 WORKDIR /app
+
 COPY package.json yarn.lock tsconfig.json tslint.json ./
+
 RUN yarn install --frozen-lockfile
 
 # If using npm with a `package-lock.json` comment out above and use below instead
 # COPY package.json package-lock.json ./ 
 # RUN npm ci
 
 # Rebuild the source code only when needed
-FROM node:16-alpine AS builder
+FROM node:17-alpine AS builder
+
 WORKDIR /app
+
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
-ENV NODE_ENV production
+
+ARG SECRET_KEY
+ARG NODE_ENV
+
+ENV SECRET_KEY=${SECRET_KEY:-secret}
+ENV NODE_ENV=${NODE_ENV:-production}
+
 RUN apk add --no-cache git
-ARG SECRET_KEY secret
 
-RUN yarn build
+RUN yarn build:docker
+
+FROM node:17-alpine AS runner
 
-FROM node:16-alpine AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
+ARG NODE_ENV
+
+ENV NODE_ENV=${NODE_ENV:-production}
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 drift

server/package.json

@@ -7,6 +7,7 @@
 		"start": "cross-env NODE_ENV=production node dist/index.js",
 		"dev": "cross-env NODE_ENV=development nodemon index.ts",
 		"build": "mkdir -p ./dist && cp .env ./dist/.env && tsc -p ./tsconfig.json && tsc-alias -p ./tsconfig.json && yarn post-build",
+		"build:docker": "mkdir -p ./dist && cp .env.test ./dist/.env && tsc -p ./tsconfig.json && tsc-alias -p ./tsconfig.json && yarn post-build",
 		"post-build": "cp package.json ./dist/package.json && cp yarn.lock ./dist/yarn.lock && cd dist && env NODE_ENV=production yarn install",
 		"migrate:up": "ts-node migrate up",
 		"migrate:down": "ts-node migrate down",