remove docker-compose.env concept

Author: wanwiset25

deployment-generator/scripts/docker-down.sh

@@ -12,5 +12,5 @@ if [[ -z $1 ]]; then
   exit
 fi
 
-docker compose --env-file ../docker-compose.env --profile $1 down
+docker compose --profile $1 down
 

deployment-generator/scripts/docker-up.sh

@@ -11,6 +11,6 @@ if [[ -z $1 ]]; then
   exit
 fi
 
-docker compose --env-file ../docker-compose.env --profile $1 pull
-docker compose --env-file ../docker-compose.env --profile $1 up -d
+docker compose --env-file --profile $1 pull
+docker compose --env-file --profile $1 up -d
 

deployment-generator/src/gen.js

@@ -68,7 +68,6 @@ for (let i = 1; i <= config.num_subnet; i++) {
 deployconf = gen_env.genContractDeployEnv();
 
 const compose_content = yaml.dump(doc, {});
-const compose_conf = gen_compose.genComposeEnv();
 
 // deployment commands list
 const commands = gen_other.genCommands();
@@ -142,13 +141,6 @@ function writeGenerated(output_dir) {
     );
   }
 
-  fs.writeFileSync(`${output_dir}/docker-compose.env`, compose_conf, (err) => {
-    if (err) {
-      console.error(err);
-      exit();
-    }
-  });
-
   deployment_json = JSON.stringify(deployment_json, null, 2);
   fs.writeFileSync(
     `${output_dir}/deployment.config.json`,

deployment-generator/src/gen_compose.js

@@ -6,7 +6,6 @@ module.exports = {
   genSubnetNodes,
   genBootNode,
   genServices,
-  genComposeEnv,
   injectNetworkConfig,
 };
 
@@ -15,7 +14,7 @@ function genSubnetNodes(machine_id, num, start_num = 1) {
   for (let i = start_num; i < start_num + num; i++) {
     const node_name = "subnet" + i.toString();
     const volume = "./xdcchain" + i.toString() + ":/work/xdcchain";
-    const config_path = "${SUBNET_CONFIG_PATH}/subnet" + i.toString() + ".env";
+    const config_path = "${PWD}/subnet" + i.toString() + ".env";
     const compose_profile = "machine" + machine_id.toString();
     const port = 20302 + i;
     const rpcport = 8544 + i;
@@ -24,7 +23,7 @@ function genSubnetNodes(machine_id, num, start_num = 1) {
       image: `xinfinorg/xdcsubnets:${config.version.subnet}`,
       volumes: [
         volume,
-        "${SUBNET_CONFIG_PATH}/genesis.json:/work/genesis.json",
+        "${PWD}/genesis.json:/work/genesis.json",
       ],
       restart: "always",
       network_mode: "host",
@@ -44,7 +43,7 @@ function genSubnetNodes(machine_id, num, start_num = 1) {
 }
 
 function genBootNode(machine_id) {
-  let config_path = "${SUBNET_CONFIG_PATH}/common.env";
+  let config_path = "${PWD}/common.env";
   const machine = "machine" + machine_id.toString();
   const bootnode = {
     image: `xinfinorg/xdcsubnets:${config.version.bootnode}`,
@@ -60,7 +59,7 @@ function genBootNode(machine_id) {
 }
 
 function genServices(machine_id) {
-  const config_path = "${SUBNET_CONFIG_PATH}/common.env";
+  const config_path = "${PWD}/common.env";
   const machine = "services";
   const frontend = {
     image: `xinfinorg/subnet-frontend:${config.version.frontend}`,
@@ -99,12 +98,6 @@ function genServices(machine_id) {
   return services;
 }
 
-function genComposeEnv() {
-  // conf_path = `SUBNET_CONFIG_PATH=${config.deployment_path}/generated/`;
-  conf_path = `SUBNET_CONFIG_PATH=$PWD`
-  return conf_path;
-}
-
 function injectNetworkConfig(compose_object) {
   // networks:
   //   docker_net:

deployment-generator/src/gen_other.js

@@ -70,8 +70,6 @@ function genDeploymentJson(keys) {
 // }
 
 function genCommands() {
-  const conf_path = __dirname + "/config/";
-  const set_env = "SUBNET_CONFIG_PATH=" + conf_path;
   let csc_mode = "full";
   if (config.relayer_mode == "lite") {
     csc_mode = "lite";
@@ -86,10 +84,10 @@ function genCommands() {
         machine_name + `:                deploy subnet on machine${i}\n`;
     }
     if (i !== 1) {
-      commands += `  Prerequisite: copy docker-compose.yml,docker-compose.env,config/subnetX.env to ${machine_name}. Make sure docker-compose.env points to subnetX.env directory.\n`;
+      commands += `  Prerequisite: copy docker-compose.yml, genesis.json, config/subnetX.env to ${machine_name}.\n`;
     }
-    commands += `  docker compose --env-file docker-compose.env --profile ${machine_name} pull\n`;
-    commands += `  docker compose --env-file docker-compose.env --profile ${machine_name} up -d\n\n`;
+    commands += `  docker compose --profile ${machine_name} pull\n`;
+    commands += `  docker compose --profile ${machine_name} up -d\n\n`;
   }
   commands +=
     "\n2. After 60 seconds, confirm the Subnet is running correctly\n";
@@ -100,8 +98,8 @@ function genCommands() {
   commands += "\n4. Add CSC configuration to common.env\n";
   commands += "  - copy step 3. output CHECKPOINT_CONTRACT to common.env\n";
   commands += "\n5. Start services (relayer, backend, frontend)\n";
-  commands += `  docker compose --env-file docker-compose.env --profile services pull\n`;
-  commands += `  docker compose --env-file docker-compose.env --profile services up -d\n`;
+  commands += `  docker compose --profile services pull\n`;
+  commands += `  docker compose --profile services up -d\n`;
   commands += "\n6. Confirm Subnet services through browser UI\n";
   commands += `  Frontend: http://${config.public_ip}:5214\n`;
   commands += `  Relayer: http://${config.public_ip}:5215\n`;
@@ -134,8 +132,8 @@ function genCommands() {
     commands +=
       "  - Add PARENTNET_ZERO_WALLET_PK to common.env, this should be different from PARENTNET_WALLET_PK\n";
     commands += "\n4. Restart Relayer\n";
-    commands += `  docker compose --env-file docker-compose.env --profile services down\n`;
-    commands += `  docker compose --env-file docker-compose.env --profile services up -d\n`;
+    commands += `  docker compose --profile services down\n`;
+    commands += `  docker compose --profile services up -d\n`;
     commands += "\n5. Confirm Relayer is running  \n";
     commands += `  Relayer: http://${config.public_ip}:5215\n`;
     commands += `  Frontend: http://${config.public_ip}:5214\n`;
@@ -179,8 +177,8 @@ function genCommands() {
     commands += "  - check keys.json for the Grandmaster Key as the source wallet\n"
     commands += "  - for the destination wallet you should use the public address of SUBNET_WALLET_PK and SUBNET_ZERO_WALLET_PK\n"
     commands += "\n6. Restart Relayer\n";
-    commands += `  docker compose --env-file docker-compose.env --profile services down\n`;
-    commands += `  docker compose --env-file docker-compose.env --profile services up -d\n`;
+    commands += `  docker compose --profile services down\n`;
+    commands += `  docker compose --profile services up -d\n`;
     commands += "\n7. Confirm Relayer is running  \n";
     commands += `  Relayer: http://${config.public_ip}:5215\n`;
     commands += `  Frontend: http://${config.public_ip}:5214\n`;