feat: improve heroku setup

api/Dockerfile → api/Dockerfile.api

@@ -2,7 +2,7 @@
 ARG NODE_VERSION=node:16.14.2
 
 FROM $NODE_VERSION AS dependency-base
-ENV PORT=$PORT
+ENV PORT=3000
 ENV DATABASE_URL=$DATABASE_URL
 ENV JWT_SECRET=$JWT_SECRET
 ENV AUTH_SIGNUP_ENABLED=$AUTH_SIGNUP_ENABLED
@@ -15,8 +15,6 @@ WORKDIR /app
 # copy the app, note .dockerignore
 COPY package.json .
 COPY yarn.lock .
-COPY Procfile .
-COPY heroku.yml .
 RUN yarn install --frozen-lockfile
 
 FROM dependency-base AS production

api/src/env/index.ts

@@ -1,12 +1,13 @@
-import dotenv from 'dotenv';
-import { getJwtSecret, getJwtExpirationPeriod } from './getters';
+import dotenv from "dotenv";
+import { getJwtSecret, getJwtExpirationPeriod } from "./getters";
 
 dotenv.config();
 
 export const JWT_SECRET = getJwtSecret();
-export const PORT = Number(process.env.PORT ?? '3001');
-export const isDevelopment = process.env.NODE_ENV === 'development';
+export const PORT = 3000;
+export const isDevelopment = process.env.NODE_ENV === "development";
 export const AUTH_SIGNUP_ENABLED = Boolean(process.env.AUTH_SIGNUP_ENABLED);
 export const JWT_EXPIRATION_PERIOD: string = getJwtExpirationPeriod();
 export const API_ORIGIN = process.env.API_ORIGIN || `http://0.0.0.0:${PORT}`;
-export const API_GQL_ENDPOINT = process.env.API_GQL_ENDPOINT || `${API_ORIGIN}/graphql`;
+export const API_GQL_ENDPOINT =
+  process.env.API_GQL_ENDPOINT || `${API_ORIGIN}/graphql`;

docker-compose.yaml

@@ -34,27 +34,27 @@ services:
       database:
         condition: service_healthy
 
-  frontend:
-    restart: unless-stopped
-    build:
-      context: .
-      dockerfile: ./frontend/Dockerfile
-    expose:
-      - 3000
+  # frontend:
+  #   restart: unless-stopped
+  #   build:
+  #     context: .
+  #     dockerfile: ./frontend/Dockerfile
+  #   expose:
+  #     - 3000
 
-  wundergraph:
-    platform: linux/amd64
-    restart: unless-stopped
-    expose:
-      - 3002
-    build:
-      context: ./wundergraph
-    environment:
-      SWITCHBOARD_GQL_ENDPOINT: "http://api:3000/graphql"
-    depends_on:
-      - api
+  # wundergraph:
+  #   platform: linux/amd64
+  #   restart: unless-stopped
+  #   expose:
+  #     - 3002
+  #   build:
+  #     context: ./wundergraph
+  #   environment:
+  #     SWITCHBOARD_GQL_ENDPOINT: "http://api:3000/graphql"
+  #   depends_on:
+  #     - api
 
-  reverse-proxy:
+  web:
     restart: unless-stopped
     image: nginx:stable
     ports:
@@ -63,4 +63,4 @@ services:
       - ./nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - api
-      - frontend
+      # - frontend

frontend/Dockerfile

@@ -11,7 +11,7 @@ WORKDIR /app/frontend
 COPY frontend/package.json .
 COPY frontend/package-lock.json .
 COPY frontend/scripts ./scripts
-RUN npm ci
+RUN npm install
 
 FROM dependency-base AS production-base
 
@@ -20,7 +20,7 @@ FROM dependency-base AS production-base
 COPY frontend /app/frontend
 COPY api /app/api
 WORKDIR /app/api
-RUN npm ci
+RUN npm install
 WORKDIR /app/frontend
 
 # Set env vars before build