fix: updates to Docker images for consistency across Gateway services

.github/workflows/release.yml

@@ -51,7 +51,6 @@ jobs:
         with:
           flavor: |
             latest=auto
-            prefix=api-,onlatest=true
           images: |
             ${{env.DOCKER_HUB_PROFILE}}/${{env.IMAGE_NAME}}
           tags: |
@@ -75,4 +74,4 @@ jobs:
           platforms: linux/amd64
           push: ${{env.TEST_RUN != 'true'}}
           file: ./Dockerfile
-          tags: ${{ steps.cp-tags.outputs.tags }}
+          tags: ${{ steps.cp-tags.outputs.tags }}

.tool-versions

@@ -1 +1 @@
-nodejs 18.16.0
+nodejs 20.12.2

Dockerfile

@@ -1,5 +1,5 @@
 # Use a multi-stage build for efficiency
-FROM node:18 AS builder
+FROM node:20 AS builder
 
 WORKDIR /usr/src/app
 
@@ -13,17 +13,18 @@ COPY . .
 RUN npm run build
 
 # Production stage
-FROM node:18
+FROM node:20
 
 WORKDIR /usr/src/app
 
 COPY --from=builder /usr/src/app/dist ./dist
 COPY package*.json ./
-
 COPY ./lua ./lua
+
 RUN npm install --only=production
+
 EXPOSE 3000
-ENV START_PROCESS="api"
 
+ENV START_PROCESS="api"
 
-CMD ["sh", "-c", "if [ \"$START_PROCESS\" = \"api\" ]; then npm run start:api:prod; else npm run start:worker:prod; fi"]
+ENTRYPOINT ["npm", "run", "start:${START_PROCESS}:prod"]

apps/worker/src/main.ts

@@ -5,4 +5,4 @@ async function bootstrap() {
   const app = await NestFactory.createApplicationContext(WorkerModule);
   app.enableShutdownHooks();
 }
-bootstrap();
+bootstrap().catch((error) => console.error(error));

dev.Dockerfile

@@ -1,10 +1,13 @@
-FROM node:18
+FROM node:20
 
 WORKDIR /app
-COPY . .
 
-RUN npm install
+# COPY . .
+
+# RUN npm install
+
 EXPOSE 3000
+
 ENV START_PROCESS="api"
 
-CMD ["sh", "-c", "if [ \"$START_PROCESS\" = \"api\" ]; then npm run start:api; else npm run start:worker; fi"]
+ENTRYPOINT npm run start:${START_PROCESS}:watch

docker-compose.dev.yaml

@@ -11,7 +11,7 @@ services:
       - content-publishing-service
 
   frequency:
-    image: frequencychain/instant-seal-node:latest
+    image: dsnp/instant-seal-node-with-deployed-schemas:latest
     ports:
       - 9944:9944
     networks:
@@ -31,16 +31,19 @@ services:
       - ipfs_data:/data/ipfs
 
   content-publishing-service-api:
+    pull_policy: never
+    image: content-publishing-service
     build:
       context: .
       dockerfile: dev.Dockerfile
+      tags:
+        - content-publishing-service:latest
     ports:
       - 3000:3000
     env_file:
       - .env.docker.dev
     environment:
       - START_PROCESS=api
-      - REDIS_URL=redis://redis:6379
     volumes:
       - ./:/app
     depends_on:
@@ -51,14 +54,17 @@ services:
       - content-publishing-service
 
   content-publishing-service-worker:
+    pull_policy: never
+    image: content-publishing-service
     build:
       context: .
       dockerfile: dev.Dockerfile
+      tags:
+        - content-publishing-service:latest
     env_file:
       - .env.docker.dev
     environment:
       - START_PROCESS=worker
-      - REDIS_URL=redis://redis:6379
     volumes:
       - ./:/app
     depends_on:
@@ -75,5 +81,3 @@ volumes:
 
 networks:
   content-publishing-service:
-
-

package.json

@@ -9,8 +9,10 @@
     "generate-swagger-ui": "redoc-cli bundle swagger.yaml --output=./docs/index.html",
     "format": "prettier --write \"apps/**/*.ts\" \"libs/**/*.ts\"",
     "start:api": "nest start api",
-    "start:api:prod": "node dist/apps/api/main.js", 
+    "start:api:watch": "nest start api --watch",
+    "start:api:prod": "node dist/apps/api/main.js",
     "start:worker": "nest start worker",
+    "start:worker:watch": "nest start worker --watch",
     "start:worker:prod": "node dist/apps/worker/main.js",
     "start:api:dev": "set -a ; . .env ; nest start api",
     "start:worker:dev": "set -a ; . .env ; nest start worker",