🔧 refactor(publish.yaml, Dockerfile): move environment variables from…

… GitHub workflow to Dockerfile build args 🔧 refactor(publish.yaml): remove redundant MYSQL_DB_PORT from environment variables 🔧 refactor(Dockerfile): add MYSQL_DB_PORT as a build arg with default value 3306 🔧 refactor(Dockerfile): add environment variables for database connection details 🔧 refactor(Dockerfile): add ENABLE_DRIZZLE_LOGGER as a build arg and environment variable 🔧 refactor(Dockerfile): add ORIGIN as a build arg and environment variable
drewpayment · Feb 19, 2024 · 3e1b834 · 3e1b834
1 parent 681d0d7
commit 3e1b834
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -6,10 +6,8 @@ on:
       - main
 
 env:
-  ENABLE_DRIZZLE_LOGGER: false
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
   MYSQL_DB_HOST: 'aws.connect.psdb.cloud'
-  MYSQL_DB_PORT: 3306
   MYSQL_DB_USER: ${{ secrets.MYSQL_DB_USER }}
   MYSQL_DB_PASSWORD: ${{ secrets.MYSQL_DB_PASSWORD }}
   MYSQL_DB_NAME: ${{ secrets.MYSQL_DB_NAME }}
@@ -43,6 +41,14 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: ghcr.io/drewpayment/stacks:latest
+          args: |
+            --build-arg ORIGIN=https://stacks.drewpayment.com
+            --build-arg ENABLE_DRIZZLE_LOGGER=false
+            --build-arg DATABASE_URL=$DATABASE_URL
+            --build-arg MYSQL_DB_HOST=$MYSQL_DB_HOST
+            --build-arg MYSQL_DB_USER=$MYSQL_DB_USER
+            --build-arg MYSQL_DB_PASSWORD=$MYSQL_DB_PASSWORD
+            --build-arg MYSQL_DB_NAME=$MYSQL_DB_NAME
 
       - name: Build and push GHCR Apple Silicon image
         uses: docker/build-push-action@v2
@@ -52,3 +58,12 @@ jobs:
           platforms: linux/arm64
           push: true
           tags: ghcr.io/drewpayment/stacks:latest
+          args: |
+            --build-arg ORIGIN=https://stacks.drewpayment.com
+            --build-arg ENABLE_DRIZZLE_LOGGER=false
+            --build-arg DATABASE_URL=$DATABASE_URL
+            --build-arg MYSQL_DB_HOST=$MYSQL_DB_HOST
+            --build-arg MYSQL_DB_USER=$MYSQL_DB_USER
+            --build-arg MYSQL_DB_PASSWORD=$MYSQL_DB_PASSWORD
+            --build-arg MYSQL_DB_NAME=$MYSQL_DB_NAME
+            
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,23 @@ FROM node:20-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 ARG ORIGIN=http://localhost:3000
+ARG ENABLE_DRIZZLE_LOGGER=true
+ARG DATABASE_URL
+ARG MYSQL_DB_HOST
+ARG MYSQL_DB_PORT=3306
+ARG MYSQL_DB_USER
+ARG MYSQL_DB_PASSWORD
+ARG MYSQL_DB_NAME
+
+ENV ENABLE_DRIZZLE_LOGGER=$ENABLE_DRIZZLE_LOGGER
+ENV DATABASE_URL=$DATABASE_URL
+ENV MYSQL_DB_HOST=$MYSQL_DB_HOST
+ENV MYSQL_DB_PORT=$MYSQL_DB_PORT
+ENV MYSQL_DB_USER=$MYSQL_DB_USER
+ENV MYSQL_DB_PASSWORD=$MYSQL_DB_PASSWORD
+ENV MYSQL_DB_NAME=$MYSQL_DB_NAME
 ENV ORIGIN=$ORIGIN
+
 RUN corepack enable
 
 # install dependencies