infra(redis): add and init redis dockerfile, reorganize dockerfile under infra folder and refactor scripts (#50)

DavideTarditi · web-flow · commit 750277eace85 · 2025-05-17T13:47:24.000+02:00
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -43,7 +43,7 @@ jobs:
 
             - name: Tag and push images
               run: |
-                  for service in db studio api app cdn; do
+                  for service in db studio api app cdn redis; do
                     docker tag ${{ steps.vars.outputs.repo_lower }}-$service ghcr.io/${{ steps.vars.outputs.owner_lower }}/${{ steps.vars.outputs.repo_lower }}-$service:latest
                     docker push ghcr.io/${{ steps.vars.outputs.owner_lower }}/${{ steps.vars.outputs.repo_lower }}-$service:latest
                   done
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -27,11 +27,12 @@
         "dotenv": "^16.4.7",
         "express": "^4.21.2",
         "jsonwebtoken": "^9.0.2",
+        "lodash": "^4.17.21",
         "multer": "^1.4.5-lts.1",
         "prisma": "^6.4.1",
+        "redis": "^5.0.1",
         "ts-node": "^10.9.2",
         "typescript": "^5.7.3",
-        "lodash": "^4.17.21",
         "ua-parser-js": "^2.0.1"
     },
     "devDependencies": {
@@ -43,8 +44,8 @@
         "@types/cookie-parser": "^1.4.8",
         "@types/cors": "^2.8.17",
         "@types/jsonwebtoken": "^9.0.8",
-        "@types/multer": "^1.4.12",
         "@types/lodash": "^4.17.15",
+        "@types/multer": "^1.4.12",
         "@typescript-eslint/eslint-plugin": "^8.22.0",
         "@typescript-eslint/parser": "^8.22.0",
         "nodemon": "^3.1.9",
diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
@@ -6,11 +6,23 @@ networks:
         external: true
 
 services:
+    redis:
+        container_name: redis
+        build:
+            context: ..
+            dockerfile: ./infra/redis/redis.dockerfile
+        restart: always
+        env_file: .env
+        ports:
+            - 6379:6379
+        networks:
+            - poveroh_network
+
     db:
         container_name: db
         build:
             context: ..
-            dockerfile: ./packages/prisma/db.dockerfile
+            dockerfile: ./infra/db/db.dockerfile
         restart: always
         env_file: .env
         ports:
@@ -24,7 +36,7 @@ services:
         container_name: studio
         build:
             context: ..
-            dockerfile: ./packages/prisma/studio.dockerfile
+            dockerfile: ./infra/db/studio.dockerfile
             args:
                 DATABASE_URL: ${DATABASE_URL}
         restart: always
@@ -82,7 +94,7 @@ services:
         container_name: cdn
         build:
             context: ..
-            dockerfile: ./apps/cdn/cdn.dockerfile
+            dockerfile: ./infra/cdn/cdn.dockerfile
         restart: always
         env_file: .env
         ports:
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 volumes:
     database-data:
 
@@ -8,6 +6,16 @@ networks:
         external: true
 
 services:
+    redis:
+        image: ghcr.io/poveroh/poveroh-redis:latest
+        container_name: redis
+        restart: always
+        env_file: .env
+        ports:
+            - 6379:6379
+        networks:
+            - poveroh_network
+
     db:
         image: ghcr.io/poveroh/poveroh-db:latest
         container_name: db
diff --git a/infra/cdn/cdn.dockerfile b/infra/cdn/cdn.dockerfile
@@ -1,6 +1,6 @@
 FROM nginx:alpine
 
-COPY ./apps/cdn/nginx.conf /etc/nginx/conf.d/default.conf
+COPY ./infra/cdn/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 3002
 
diff --git a/infra/cdn/nginx.conf b/infra/cdn/nginx.conf
diff --git a/infra/db/db.dockerfile b/infra/db/db.dockerfile
@@ -2,4 +2,4 @@ FROM postgres:latest
 
 VOLUME /var/lib/postgresql/data
 
-EXPOSE 5432
+EXPOSE 5432
diff --git a/infra/db/studio.dockerfile b/infra/db/studio.dockerfile
diff --git a/infra/redis/redis.dockerfile b/infra/redis/redis.dockerfile
@@ -0,0 +1,5 @@
+FROM redis
+
+EXPOSE 6379
+
+CMD ["redis-server"]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,9 +17,10 @@
         "dev:api": "turbo dev --filter=api",
         "dev:app": "turbo dev --filter=app",
         "ui:add": "cd ./apps/app && npm run ui:add",
-        "setup": "npm run setup:db && npm run setup:cdn",
+        "setup": "npm run setup:db && npm run setup:cdn && npm run setup:redis",
         "setup:db": "node ./scripts/setup/db.js",
         "setup:cdn": "node ./scripts/setup/cdn.js",
+        "setup:redis": "node ./scripts/setup/redis.js",
         "setup:env": "node ./scripts/setup/env.js",
         "setup:data": "node ./scripts/data/fill-db.js",
         "setup:generate-transactions": "cd ./scripts/data && node ./transaction-generator.js",
@@ -31,11 +32,13 @@
         "clean:turbo": "find . -name '.turbo' -type d -prune -exec rm -rf '{}' +",
         "clean:env": "find . -name '.env' -type f -exec rm -f {} +",
         "clean:data": "node ./scripts/data/clean-db.js",
+        "clean:docker-cache": "docker system prune -a",
         "format": "prettier --write \"**/*.{ts,tsx,md}\"",
         "docker:create-network": "docker network ls | grep -w poveroh_network || docker network create poveroh_network",
         "docker-dev:db": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build db",
         "docker-dev:api": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build api",
         "docker-dev:app": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build app",
+        "docker-dev:redis": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build redis",
         "docker-dev:studio": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build studio",
         "docker-dev:cdn": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build cdn",
         "docker-dev": "npm run docker:create-network && cd ./docker && docker compose -f docker-compose.local.yml up -d --build",
diff --git a/scripts/setup/cdn.js b/scripts/setup/cdn.js
@@ -8,7 +8,7 @@ try {
 
     console.log('Starting Docker containers...')
     execSync('npm run docker-dev:cdn', { stdio: 'inherit', cwd: projectRoot })
-    console.log('✅ CDN setup completed!')
+    console.log('✅ Redis setup completed!')
 } catch (error) {
     console.error('❌ Error during setup:', error)
     process.exit(1)
diff --git a/scripts/setup/redis.js b/scripts/setup/redis.js
@@ -0,0 +1,15 @@
+const { execSync } = require('child_process')
+const { getProjectRoot } = require('../utils')
+
+const projectRoot = getProjectRoot()
+
+try {
+    execSync('npm run setup:env')
+
+    console.log('Starting Redis Docker containers...')
+    execSync('npm run docker-dev:redis', { stdio: 'inherit', cwd: projectRoot })
+    console.log('✅ CDN setup completed!')
+} catch (error) {
+    console.error('❌ Error during setup:', error)
+    process.exit(1)
+}

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ FROM postgres:latest`
`2`	`2`
`3`	`3`	`VOLUME /var/lib/postgresql/data`
`4`	`4`
`5`		`-EXPOSE 5432`
	`5`	`+EXPOSE 5432`