feat: store images on DB

Author: Fraguinha

.github/workflows/docker.yaml

@@ -34,31 +34,4 @@ jobs:
           platforms: linux/amd64,linux/arm/v7
           tags: fraguinha/a50passos.com:latest
           context: ./src/website
-          file: ./src/website/Dockerfile
-
-  build-assets:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm/v7
-          tags: fraguinha/a50passos.com-assets:latest
-          context: .
-          file: ./src/website/Dockerfile.assets
+          file: ./src/website/Dockerfile

Makefile

@@ -20,32 +20,18 @@ dev:
 	@echo "Building website image..."
 	@docker build --pull --no-cache -t fraguinha/a50passos.com:latest src/website
 
-	@echo "Building assets image..."
-	@docker build --pull --no-cache -t fraguinha/a50passos.com-assets:latest -f src/website/Dockerfile.assets .
-
 	@echo "Tagging website image..."
 	@docker tag fraguinha/a50passos.com localhost:10000/fraguinha/a50passos.com:latest
 
-	@echo "Tagging assets image..."
-	@docker tag fraguinha/a50passos.com-assets localhost:10000/fraguinha/a50passos.com-assets:latest
-
 	@echo "Pushing website image..."
 	@docker push localhost:10000/fraguinha/a50passos.com:latest
 
-	@echo "Pushing assets image..."
-	@docker push localhost:10000/fraguinha/a50passos.com-assets:latest
-
 	@echo "Capturing website image digest..."; \
 	WEBSITE_SHA=$$(docker inspect --format='{{index .RepoDigests 0}}' fraguinha/a50passos.com:latest | cut -d'@' -f2); \
 	echo "Website SHA: $$WEBSITE_SHA"; \
 	\
-	echo "Capturing assets image digest..."; \
-	ASSETS_SHA=$$(docker inspect --format='{{index .RepoDigests 0}}' fraguinha/a50passos.com-assets:latest | cut -d'@' -f2); \
-	echo "Assets SHA: $$ASSETS_SHA"; \
-	\
 	echo "Patching kubernetes manifests with SHA digests..."; \
 	sed -i '' "s|a50passos.com:latest|a50passos.com:latest@$$WEBSITE_SHA|g" local/website.yml; \
-	sed -i '' "s|a50passos.com-assets:latest|a50passos.com-assets:latest@$$ASSETS_SHA|g" local/website.yml; \
 	\
 	echo "Applying kubernetes manifests..."; \
 	kubectl apply -k local/
@@ -71,4 +57,4 @@ clean:
 
 mongo-shell:
 	@echo "Connecting to MongoDB shell..."
-	@docker exec -it mongodb mongosh
+	@docker exec -it mongodb mongosh

k8s/website.yml

@@ -23,31 +23,6 @@ spec:
     alphabetical:
       order: asc
 ---
-apiVersion: image.toolkit.fluxcd.io/v1
-kind: ImageRepository
-metadata:
-  name: a50passos-website-assets-image
-  namespace: flux-system
-spec:
-  image: fraguinha/a50passos.com-assets
-  interval: 1m0s
----
-apiVersion: image.toolkit.fluxcd.io/v1
-kind: ImagePolicy
-metadata:
-  name: a50passos-website-assets-policy
-  namespace: flux-system
-spec:
-  digestReflectionPolicy: Always
-  interval: 1m0s
-  imageRepositoryRef:
-    name: a50passos-website-assets-image
-  filterTags:
-    pattern: '^latest$'
-  policy:
-    alphabetical:
-      order: asc
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -63,23 +38,9 @@ spec:
       labels:
         app: website
     spec:
-      initContainers:
-        - name: create-uploads-dir
-          image: busybox
-          command: ['sh', '-c', 'mkdir -p /app/dist/public/images/uploads && chmod -R 755 /app/dist/public/images/uploads']
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
-        - name: copy-image-assets
-          image: fraguinha/a50passos.com-assets:latest@sha256:0df2dfb11aedd0be1735e61a9724f475730fd2a05892fd2883a485b97340204a # {"$imagepolicy": "a50passos:a50passos-website-assets-policy"}
-          imagePullPolicy: Always
-          command: ['sh', '-c', 'cp -r /assets/* /app/dist/public/images/']
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
       containers:
         - name: website
-          image: fraguinha/a50passos.com:latest@sha256:733675b0a356cc9ca9273893b7c211d25f6a86e9d4de75f0a967ab4c801fe8cb # {"$imagepolicy": "a50passos:a50passos-website-policy"}
+          image: fraguinha/a50passos.com:latest@sha256:30cbb196613ca6445d9dad2f7f31dca16788ec0f751525cb16cab4d14e36726e # {"$imagepolicy": "a50passos:a50passos-website-policy"}
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
@@ -100,13 +61,6 @@ spec:
                 secretKeyRef:
                   name: a50passos-secrets
                   key: SESSION_SECRET
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
-      volumes:
-        - name: images
-          persistentVolumeClaim:
-            claimName: a50passos-images-pvc
 ---
 apiVersion: v1
 kind: Service
@@ -118,19 +72,3 @@ spec:
     app: website
   ports:
     - port: 8080
-      targetPort: 8080
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: a50passos-images-pvc
-  namespace: a50passos
-  annotations:
-    recurring-job.longhorn.io/default: enabled
-spec:
-  accessModes:
-    - ReadWriteMany
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 1Gi

local/website.yml

@@ -13,20 +13,6 @@ spec:
       labels:
         app: website
     spec:
-      initContainers:
-        - name: create-uploads-dir
-          image: busybox
-          command: ['sh', '-c', 'mkdir -p /app/dist/public/images/uploads && chmod -R 755 /app/dist/public/images/uploads']
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
-        - name: copy-image-assets
-          image: k3d-a50passos-registry:10000/fraguinha/a50passos.com-assets:latest
-          imagePullPolicy: Always
-          command: ['sh', '-c', 'cp -r /assets/* /app/dist/public/images/']
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
       containers:
         - name: website
           image: k3d-a50passos-registry:10000/fraguinha/a50passos.com:latest
@@ -50,13 +36,6 @@ spec:
                 secretKeyRef:
                   name: a50passos-secrets
                   key: SESSION_SECRET
-          volumeMounts:
-            - name: images
-              mountPath: /app/dist/public/images
-      volumes:
-        - name: images
-          persistentVolumeClaim:
-            claimName: a50passos-images-pvc
 ---
 apiVersion: v1
 kind: Service
@@ -67,17 +46,4 @@ spec:
   selector:
     app: website
   ports:
-    - port: 8080
-      targetPort: 8080
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: a50passos-images-pvc
-  namespace: a50passos
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
+    - port: 8080

src/website/Dockerfile

@@ -10,7 +10,6 @@ RUN npm ci --verbose
 COPY . .
 
 RUN npm run deploy
-RUN rm -rf /app/dist/public/images
 
 FROM node:22-slim
 

src/website/Dockerfile.assets

@@ -8,7 +8,7 @@
     "start": "node dist/server.js",
     "build": "tsc",
     "views": "cp -r src/views dist",
-    "public": "cp -r src/public dist; mkdir -p dist/public/images/uploads",
+    "public": "cp -r src/public dist",
     "dist": "npm run views; npm run public",
     "deploy": "npm run build; npm run dist",
     "clean": "rm -rf dist",

src/website/package.json

@@ -1,10 +1,12 @@
 import express from 'express'
 import admin from './routes/admin.js'
 import auth from './routes/auth.js'
+import images from './routes/images.js'
 
 const router = express.Router()
 
 router.use('/admin', admin)
 router.use('/auth', auth)
+router.use('/images', images)
 
 export default router