✨ Update Docker and Deployment Configuration

- Modify Docker Compose to use new environment variable names for database configuration
- Add initialization SQL script to the MySQL service in Docker Compose
- Update Dockerfile to use npm install with force for dependency installation
- Adjust deployment workflow to dynamically set database names in the .env file
- Remove outdated migration files related to articles

Author: BrightkyEfoo

.github/workflows/deploy.dev.yml

@@ -9,6 +9,7 @@ env:
   APP_NAME: ${{ github.event.repository.name }}
   APP_PATH: /home/apps/${{ github.event.repository.name }}
   ENV: dev
+  DATABASE_NAME: javascript_cm
 
 jobs:
   deploy:
@@ -55,13 +56,13 @@ jobs:
             echo "DB_PORT=3306" >> .env
             echo "DB_USER=root" >> .env
             echo "DB_PASSWORD=root" >> .env
-            echo "DB_DATABASE=jscm" >> .env
+            echo "DB_DATABASE=${{ env.DATABASE_NAME }}" >> .env
             echo "MYSQL_HOST=mysql" >> .env
             echo "MYSQL_PORT=3306" >> .env
             echo "MYSQL_USER=root" >> .env
             echo "MYSQL_PASSWORD=root" >> .env
-            echo "MYSQL_DB_NAME=jscm" >> .env
-            echo "MYSQL_DATABASE=jscm" >> .env
+            echo "MYSQL_DB_NAME=${{ env.DATABASE_NAME }}" >> .env
+            echo "MYSQL_DATABASE=${{ env.DATABASE_NAME }}" >> .env
             echo "GITHUB_CLIENT_ID=github_client_id" >> .env
             echo "GITHUB_CLIENT_SECRET=github_client_secret" >> .env
             echo "GITHUB_CALLBACK_URL=http://0.0.0.0:3333/auth/github/callback" >> .env

Dockerfile.dev

@@ -6,13 +6,13 @@ FROM $NODE_IMAGE AS base
 FROM base AS deps
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci
+RUN npm install --force
 
 # Production only deps stage
 FROM base AS production-deps
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci --omit=dev
+RUN npm install --force
 
 # Build stage
 FROM base AS build

compose.dev.yaml

@@ -4,20 +4,22 @@ services:
     container_name: jscm_mysql
     restart: always
     ports:
-      - "${MYSQL_PORT:-3306}:3306"
+      - "${DB_PORT:-3306}:3306"
     env_file:
       - .env
     volumes:
       - jscm_mysql_volume:/var/lib/mysql
+      - ./database/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
+      
     environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DB_NAME}
-      - MYSQL_USER=${MYSQL_USER}
-      # - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+      - MYSQL_DATABASE=${DB_DATABASE}
+      # - MYSQL_USER=${DB_USER}
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       retries: 3
       timeout: 5s
+      
     networks:
       - adonis_jscm
 
@@ -47,17 +49,10 @@ services:
       - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
       - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET}
       - GITHUB_CALLBACK_URL=${GITHUB_CALLBACK_URL}
-      - MYSQL_HOST=${MYSQL_HOST}
-      - MYSQL_PORT=${MYSQL_PORT}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DB_NAME=${MYSQL_DB_NAME}
-      - MYSQL_DATABASE=${MYSQL_DB_NAME}
-    
     volumes:
       - jscm_uploads:/app/uploads
       - jscm_public:/app/public
-    command: sh -c "node ace migration:fresh --force && node ace convert:csv-to-json && node ace db:seed && node ace seed:test-data && npm run gen-docs && npm run start"
+    command: sh -c "node ace migration:fresh --force && node ace db:seed && npm run start"
     depends_on:
       mysql:
         condition: service_healthy

database/init.sql

@@ -0,0 +1 @@
+CREATE TABLE IF NOT EXISTS DATABASE javascript_cm;

…/17368394109899_create_articles_table.ts …s/1736839410989_create_articles_table.tsdatabase/migrations/17368394109899_create_articles_table.ts renamed to database/migrations/1736839410989_create_articles_table.ts database/migrations/17368394109899_create_articles_table.ts renamed to database/migrations/1736839410989_create_articles_table.ts

@@ -11,6 +11,7 @@ export default class extends BaseSchema {
       table.text('excerpt').notNullable()
       table.text('content').notNullable()
       table.integer('user_id').unsigned().references('id').inTable('users').onDelete('CASCADE')
+      table.integer('author_id').unsigned().references('id').inTable('users').onDelete('CASCADE')
       table.boolean('is_published').defaultTo(false)
       table.timestamp('published_at').nullable()
       table.timestamps(true, true)