Include pedestrian in docker-compose.yml

Author: danthonywalker

.dockerignore

@@ -1,6 +1,6 @@
+/.env
 /LICENSE
 /README.md
-/build
 /dump.sql
 /flyway
 

.gitignore

@@ -1,4 +1,4 @@
-/build
+/.env
 /dump.sql
 
 # JetBrains

.prettierignore

@@ -1,4 +1,4 @@
-/build
+/.env
 /dump.sql
 
 # Git

Dockerfile

@@ -1,25 +1,17 @@
-FROM node:20.6.0 as buildDependencies
-WORKDIR /pedestrian
-COPY package*.json ./
-RUN npm ci
+FROM node:20.8.0
 
-FROM node:20.6.0 as dependencies
 WORKDIR /pedestrian
+
+# Express port
+EXPOSE 8080
+
 COPY package*.json ./
-ENV NODE_ENV=production
+
 RUN npm ci
 
-FROM node:20.6.0 as build
-WORKDIR /pedestrian
-COPY --from=buildDependencies /pedestrian/node_modules node_modules
 COPY . .
-RUN npm run check
-RUN npm run build
 
-FROM node:20.6.0
-WORKDIR /pedestrian
-COPY --from=dependencies /pedestrian/node_modules node_modules
-COPY --from=build /pedestrian/build build
+RUN npm run check \
+    && npx tsc
 
-EXPOSE 8080
 CMD node --no-warnings --enable-source-maps build/index.js

README.md

@@ -6,7 +6,7 @@ A custom bot designed for [The Anti-Car Collective](https://discord.gg/anticar)
 
 [Node.js](https://nodejs.org) and [docker-compose](https://docs.docker.com/compose) is required for development.
 
-Starting (`npm run start`) requires the project to be installed (`npm install`), built (`npm run build`), have services running (`npm run services`), and required [environment variables](#environment-variables) configured.
+Required [environment variables](#environment-variables) must be configured in a `.env` file at the project's root to start (`npm run start`).
 
 It is recommended to dump (`npm run dump`) the database before migrating (`npm run migrate`) in case restoring (`npm run restore`) is required.
 
@@ -23,13 +23,13 @@ Code must pass minimum quality standards checks (`npm run check`) to be merged:
 | BOT_GUILD_ID         | ❌       |               | Guild ID to enable `/bot`                                                                              |
 | DISCORD_TOKEN        | ✅       |               | [Create Discord Token](https://discord.com/developers/docs/getting-started#configuring-your-bot)       |
 | EXPRESS_PORT         | ❌       | 8080          |                                                                                                        |
-| POSTGRESQL_HOST      | ❌       | localhost     |                                                                                                        |
+| POSTGRESQL_HOST      | ❌       | postgres      |                                                                                                        |
 | POSTGRESQL_PORT      | ❌       | 5432          |                                                                                                        |
 | POSTGRESQL_DATABASE  | ❌       | db            |                                                                                                        |
 | POSTGRESQL_USER      | ❌       | user          |                                                                                                        |
 | POSTGRESQL_PASSWORD  | ❌       | password      |                                                                                                        |
 | PROJECT_NAME         | ❌       | Pedestrian    |                                                                                                        |
-| REDIS_HOST           | ❌       | localhost     |                                                                                                        |
+| REDIS_HOST           | ❌       | redis         |                                                                                                        |
 | REDIS_PORT           | ❌       | 6379          |                                                                                                        |
 | REDIS_CLUSTER        | ❌       |               | IIF value is "true" then Redis will run in [cluster mode](https://redis.io/docs/management/scaling/)   |
 | REDIS_USERNAME       | ❌       |               |                                                                                                        |

docker-compose.yml

@@ -1,23 +1,35 @@
+version: "3.8"
 services:
-  flyway:
-    build: flyway
-    command:
-      - "-url=jdbc:postgresql://postgres:5432/db"
-      - "-user=user"
-      - "-password=password"
-      - "-connectRetries=60"
-      - "migrate"
-    depends_on:
-      - postgres
   postgres:
-    image: postgres:15.4
+    container_name: postgres
+    image: postgres:16.0
     environment:
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=db
     ports:
       - 5432:5432
   redis:
-    image: redis:7.2.0
+    container_name: redis
+    image: redis:7.2.1
     ports:
       - 6379:6379
+  flyway:
+    container_name: flyway
+    build: flyway
+    command:
+      - "-url=jdbc:postgresql://postgres:5432/db"
+      - "-user=user"
+      - "-password=password"
+      - "-connectRetries=60"
+      - "migrate"
+    depends_on:
+      - postgres
+  pedestrian:
+    container_name: pedestrian
+    build: .
+    env_file: .env
+    depends_on:
+      - postgres
+      - redis
+      - flyway

flyway/Dockerfile

@@ -1,3 +1,3 @@
-FROM flyway/flyway:9.22.1-alpine
+FROM flyway/flyway:9.22.2-alpine
 
 COPY sql/* /flyway/sql