underpost 2.8.85 → 2.8.87

package/src/server/start.js

@@ -79,11 +79,11 @@ class UnderpostStartUp {
         }
       }),
 
-    async callback(deployId = 'default', env = 'development', options = { build: false, run: false }) {
+    async callback(deployId = 'dd-default', env = 'development', options = { build: false, run: false }) {
       if (options.build === true) await UnderpostStartUp.API.build(deployId, env);
       if (options.run === true) await UnderpostStartUp.API.run(deployId, env);
     },
-    async build(deployId = 'default', env = 'development') {
+    async build(deployId = 'dd-default', env = 'development') {
       const buildBasePath = `/home/dd`;
       const repoName = `engine-${deployId.split('-')[1]}`;
       shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
@@ -100,19 +100,19 @@ class UnderpostStartUp {
       }
       shellExec(`node bin/deploy build-full-client ${deployId}`);
     },
-    async run(deployId = 'default', env = 'development') {
+    async run(deployId = 'dd-default', env = 'development') {
       const runCmd = env === 'production' ? 'run prod-img' : 'run dev-img';
       if (fs.existsSync(`./engine-private/replica`)) {
         const replicas = await fs.readdir(`./engine-private/replica`);
         for (const replica of replicas) {
           if (!replica.match(deployId)) continue;
           shellExec(`node bin/deploy conf ${replica} ${env}`);
-          shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
+          shellExec(`npm ${runCmd} ${replica}`, { async: true });
           await awaitDeployMonitor(true);
         }
       }
       shellExec(`node bin/deploy conf ${deployId} ${env}`);
-      shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`, { async: true });
+      shellExec(`npm ${runCmd} ${deployId}`, { async: true });
       await awaitDeployMonitor(true);
       UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-running-deployment`);
     },

package/test/api.test.js

@@ -21,12 +21,13 @@ const BASE_URL =
 
 describe(`GET 'Test' API Request `, async () => {
   {
-    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=o4f42SbyDMk`;
+    const youtubeId = '2aib-pmgUdQ';
+    const url = `${BASE_URL}/test/youtube-id/?url=https://www.youtube.com/watch?v=${youtubeId}`;
     it(`youtube id from raw youtube url`, async () => {
       logger.info('request info', { url });
       const res = await axios.get(url);
       logger.info('response', res.data);
-      return expect(res.data.data).equal('o4f42SbyDMk');
+      return expect(res.data.data).equal(youtubeId);
     });
   }
   {

package/docker-compose.yml

@@ -1,67 +0,0 @@
-# https://docs.docker.com/compose/compose-file/compose-file-v3
-# https://docs.docker.com/engine/reference/commandline/compose/
-version: '3'
-services:
-  prometheus:
-    image: prom/prometheus
-    ports:
-      - 9090:9090
-    volumes:
-      - ./prometheus_data:/prometheus
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml
-    command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-    networks:
-      - load-balancer
-
-  grafana:
-    image: grafana/grafana
-    ports:
-      - 3000:3000
-    volumes:
-      - ./grafana_data:/var/lib/grafana
-    #  - ./grafana.ini:/etc/grafana/grafana.ini
-    networks:
-      - load-balancer
-    depends_on:
-      - prometheus
-
-  underpost-engine:
-    build:
-      dockerfile: ./Dockerfile
-      context: . # workdir path
-    # image: underpost-engine
-    # container_name: <name> ignore for replicas
-    ports:
-      - '22'
-      - '80' # host port allocated dynamically, host ports are unique independent of replicas
-      - '443'
-      - '3306'
-      - '27017'
-      - '4001-4002:3001'
-      - '3002-3020'
-    volumes:
-      - ./logs:/code/logs
-    deploy:
-      mode: replicated
-      replicas: 2
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-        window: 120s
-      resources:
-        limits:
-          cpus: '2'
-          memory: 400M
-        reservations:
-          cpus: '0.25'
-          memory: 20M
-    labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.85'
-    networks:
-      - load-balancer
-
-networks:
-  load-balancer:
-    driver: bridge

package/prometheus.yml

@@ -1,36 +0,0 @@
-# my global config
-global:
-  scrape_interval: 5s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 5s # Evaluate rules every 15 seconds. The default is every 1 minute.
-  # scrape_timeout is set to the global default (10s).
-
-# Alertmanager configuration
-alerting:
-  alertmanagers:
-    - static_configs:
-        - targets:
-          # - alertmanager:9093
-
-# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
-rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
-
-# A scrape configuration containing exactly one endpoint to scrape:
-# Here it's Prometheus itself.
-scrape_configs:
-  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus_service'
-
-    # metrics_path defaults to '/metrics'
-    # scheme defaults to 'http'.
-
-    static_configs:
-      - targets: ['host.docker.internal:9090']
-
-  - job_name: 'nodejs_service'
-    static_configs:
-      - targets: ['host.docker.internal:4001', 'host.docker.internal:4002']
-      # - targets: ['localhost:4001', 'localhost:4002']
-      # - targets: ["host.docker.internal:3002"] # Windows
-      # - targets: ["docker.for.mac.localhost:9090"] # macOs