feat: combine image and tag in single field

docker-compose.platform.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   drive_mongodb:
-    image: ${PLATFORM_DRIVE_MONGODB_DOCKER_IMAGE:?err}:${PLATFORM_DRIVE_MONGODB_VERSION:?err}
+    image: ${PLATFORM_DRIVE_MONGODB_DOCKER_IMAGE:?err}
     restart: unless-stopped
     volumes:
       - drive_mongodb:/data/db
@@ -11,15 +11,15 @@ services:
     command: mongod --replSet driveDocumentIndices --bind_ip_all
 
   drive_mongodb_replica_init:
-    image: ${PLATFORM_DRIVE_MONGODB_DOCKER_IMAGE:?err}:${PLATFORM_DRIVE_MONGODB_VERSION:?err}
+    image: ${PLATFORM_DRIVE_MONGODB_DOCKER_IMAGE:?err}
     depends_on:
       - drive_mongodb
     volumes:
       - ./scripts/initiate_mongodb_replica.sh:/initiate_mongodb_replica.sh
     entrypoint: /initiate_mongodb_replica.sh
 
   drive_abci:
-    image: ${PLATFORM_DRIVE_ABCI_DOCKER_IMAGE:?err}:${PLATFORM_DRIVE_ABCI_VERSION:?err}
+    image: ${PLATFORM_DRIVE_ABCI_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - drive_mongodb_replica_init
@@ -37,7 +37,7 @@ services:
     command: npm run abci
 
   drive_tendermint:
-    image: ${PLATFORM_DRIVE_TENDERMINT_DOCKER_IMAGE:?err}:${PLATFORM_DRIVE_TENDERMINT_VERSION:?err}
+    image: ${PLATFORM_DRIVE_TENDERMINT_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - drive_abci
@@ -49,15 +49,15 @@ services:
     entrypoint: sh -c "/usr/bin/tendermint init && /usr/bin/tendermint node"
 
   dapi_insight:
-    image: ${PLATFORM_DAPI_INSIGHT_DOCKER_IMAGE:?err}:${PLATFORM_DAPI_INSIGHT_VERSION:?err}
+    image: ${PLATFORM_DAPI_INSIGHT_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - core
     volumes:
       - ./configs/${NETWORK:?err}/dapi/insight/dashcore-node.json:/insight/dashcore-node.json
 
   dapi_api:
-    image: ${PLATFORM_DAPI_API_DOCKER_IMAGE:?err}:${PLATFORM_DAPI_API_VERSION:?err}
+    image: ${PLATFORM_DAPI_API_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - drive_tendermint
@@ -82,7 +82,7 @@ services:
     command: npm run api
 
   dapi_tx_filter_stream:
-    image: ${PLATFORM_DAPI_API_DOCKER_IMAGE:?err}:${PLATFORM_DAPI_API_VERSION:?err}
+    image: ${PLATFORM_DAPI_API_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - core
@@ -105,7 +105,7 @@ services:
     command: npm run tx-filter-stream
 
   dapi_envoy:
-    image: ${PLATFORM_DAPI_ENVOY_DOCKER_IMAGE:?err}:${PLATFORM_DAPI_ENVOY_VERSION:?err}
+    image: ${PLATFORM_DAPI_ENVOY_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - dapi_api
@@ -114,7 +114,7 @@ services:
       - ./configs/${NETWORK:?err}/dapi/envoy/grpc.yaml:/etc/envoy/envoy.yaml
 
   dapi_nginx:
-    image: ${PLATFORM_DAPI_NGINX_DOCKER_IMAGE:?err}:${PLATFORM_DAPI_NGINX_VERSION:?err}
+    image: ${PLATFORM_DAPI_NGINX_DOCKER_IMAGE:?err}
     restart: unless-stopped
     depends_on:
       - dapi_api

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   core:
-    image: ${CORE_DOCKER_IMAGE:?err}:${CORE_VERSION:?err}
+    image: ${CORE_DOCKER_IMAGE:?err}
     restart: unless-stopped
     ports:
       - ${CORE_P2P_PORT:?err}:${CORE_P2P_PORT:?err} # P2P

src/config/configJsonSchema.js

@@ -4,7 +4,7 @@ module.exports = {
   $schema: 'http://json-schema.org/draft-07/schema#',
   type: 'object',
   definitions: {
-    dockerAndVersion: {
+    docker: {
       type: 'object',
       properties: {
         docker: {
@@ -17,11 +17,8 @@ module.exports = {
           required: ['image'],
           additionalProperties: false,
         },
-        version: {
-          type: 'string',
-        },
       },
-      required: ['docker', 'version'],
+      required: ['docker'],
       additionalProperties: false,
     },
   },
@@ -42,9 +39,6 @@ module.exports = {
           required: ['image'],
           additionalProperties: false,
         },
-        version: {
-          type: 'string',
-        },
         p2p: {
           type: 'object',
           properties: {
@@ -74,7 +68,7 @@ module.exports = {
           additionalProperties: false,
         },
       },
-      required: ['docker', 'version', 'p2p', 'masternode'],
+      required: ['docker', 'p2p', 'masternode'],
       additionalProperties: false,
     },
     platform: {
@@ -84,16 +78,16 @@ module.exports = {
           type: 'object',
           properties: {
             envoy: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
             nginx: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
             api: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
             insight: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
           },
           required: ['envoy', 'nginx', 'api', 'insight'],
@@ -103,13 +97,13 @@ module.exports = {
           type: 'object',
           properties: {
             mongodb: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
             abci: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
             tendermint: {
-              $ref: '#/definitions/dockerAndVersion',
+              $ref: '#/definitions/docker',
             },
           },
           required: ['mongodb', 'abci', 'tendermint'],

src/config/systemConfigs/systemConfigs.js

@@ -6,9 +6,8 @@ const baseConfig = {
   description: 'base config for use as template',
   core: {
     docker: {
-      image: 'dashpay/dashd',
+      image: 'dashpay/dashd:0.15',
     },
-    version: '0.15',
     p2p: {
       port: 20001,
     },
@@ -22,47 +21,40 @@ const baseConfig = {
     dapi: {
       envoy: {
         docker: {
-          image: 'envoyproxy/envoy',
+          image: 'envoyproxy/envoy:v1.14-latest',
         },
-        version: 'v1.14-latest',
       },
       nginx: {
         docker: {
-          image: 'nginx',
+          image: 'nginx:latest',
         },
-        version: 'latest',
       },
       api: {
         docker: {
-          image: 'dashpay/dapi',
+          image: 'dashpay/dapi:0.15-dev',
         },
-        version: '0.15-dev',
       },
       insight: {
         docker: {
-          image: 'dashpay/insight-api',
+          image: 'dashpay/insight-api:latest',
         },
-        version: 'latest',
       },
     },
     drive: {
       mongodb: {
         docker: {
-          image: 'mongo',
+          image: 'mongo:4.2',
         },
-        version: '4.2',
       },
       abci: {
         docker: {
-          image: 'dashpay/drive',
+          image: 'dashpay/drive:0.15-dev',
         },
-        version: '0.15-dev',
       },
       tendermint: {
         docker: {
-          image: 'dashpay/tendermint',
+          image: 'dashpay/tendermint:v0.32.12',
         },
-        version: 'v0.32.12',
       },
     },
     dpns: {