e2e docker-compose fix

moleculerjs · Dec 4, 2024 · d894073 · d894073
1 parent 32162b4
commit d894073
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -58,46 +58,46 @@ jobs:
       run: npm ci
 
     - name: Start NATS
-      run: docker-compose up -d nats && sleep 10
+      run: docker compose up -d nats && sleep 10
       if: ${{ matrix.transporter == 'NATS' }}
       working-directory: ./test
 
     - name: Start Redis
-      run: docker-compose up -d redis && sleep 10
+      run: docker compose up -d redis && sleep 10
       if: ${{ matrix.transporter == 'Redis' || matrix.discoverer == 'Redis' }}
       working-directory: ./test
 
     - name: Start MQTT
-      run: docker-compose up -d mqtt && sleep 10
+      run: docker compose up -d mqtt && sleep 10
       if: ${{ matrix.transporter == 'MQTT' }}
       working-directory: ./test
 
     - name: Start RabbitMQ
-      run: docker-compose up -d rabbitmq && sleep 10
+      run: docker compose up -d rabbitmq && sleep 10
       if: ${{ matrix.transporter == 'AMQP' }}
       working-directory: ./test
 
     - name: Start ActiveMQ
-      run: docker-compose up -d activemq && sleep 30
+      run: docker compose up -d activemq && sleep 30
       if: ${{ matrix.transporter == 'AMQP10' }}
       working-directory: ./test
 
     - name: Start Kafka
-      run: docker-compose up -d zookeeper kafka && sleep 60
+      run: docker compose up -d zookeeper kafka && sleep 60
       if: ${{ matrix.transporter == 'Kafka' }}
       working-directory: ./test
 
     - name: Start Etcd3
-      run: docker-compose up -d etcd3 && sleep 10
+      run: docker compose up -d etcd3 && sleep 10
       if: ${{ matrix.discoverer == 'Etcd3' }}
       working-directory: ./test
 
     - name: Check containers
-      run: docker-compose ps
+      run: docker compose ps
       working-directory: ./test
 
     - name: Check logs
-      run: docker-compose logs
+      run: docker compose logs
       working-directory: ./test
 
     - name: Execute E2E tests
@@ -110,5 +110,5 @@ jobs:
         # LOGLEVEL: "${{ matrix.transporter == 'Kafka' && 'debug' || 'warn' }}"
 
     - name: Stop containers
-      run: docker-compose down -v
+      run: docker compose down -v
       working-directory: ./test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1535,7 +1535,7 @@ module.exports = {
             level: "info",
             // Using colors on the output
             colors: true,
-            // Print module names with different colors (like docker-compose for containers)
+            // Print module names with different colors (like docker compose for containers)
             moduleColors: false,
             // Line formatter. It can be "json", "short", "simple", "full", a `Function` or a template string like "{timestamp} {level} {nodeID}/{mod}: {msg}"
             formatter: "full",

diff --git a/src/metrics/reporters/prometheus.js b/src/metrics/reporters/prometheus.js
@@ -45,7 +45,7 @@ const { isFunction } = require("../../utils");
  *
  *  Start containers:
  *
- * 		docker-compose up -d
+ * 		docker compose up -d
  *
  * Grafana dashboard: http://<docker-ip>:3000
  *

diff --git a/src/validators/base.d.ts b/src/validators/base.d.ts
@@ -1,5 +1,6 @@
 import type ServiceBroker = require("../service-broker");
 import type { ActionHandler, ActionSchema } from "../service";
+import type Context from "../context";
 
 declare namespace BaseValidator {
 	export type ValidatorNames = "Fastest";