Ports and constant tweaks

lib/commands/deploy.mjs

@@ -37,14 +37,14 @@ export async function deploy(options, _programOpts) {
     }
 
     log.info(
-        `Logs are available at: ${protocol()}://${clusterCredentials.clusterHost()}:${secrets["GRAFANA_PORT"]}`
+        `Logs are available at: ${protocol()}://${clusterCredentials.clusterHost()}:${secrets["BROWSERUP_GRAFANA_PORT"]}`
     );
     log.info(`Deploy cluster completed successfully, webconsole URL: ${clusterCredentials.clusterUrl}`);
     return clusterCredentials;
 }
 
 function protocol() {
-    return process.env.WEBCONSOLE_PROTOCOL || "http";
+    return process.env.BROWSERUP_WEBCONSOLE_PROTOCOL || "http";
 }
 
 async function deployLocalCluster(clusterParams)

lib/commands/post-install.mjs

@@ -39,17 +39,16 @@ async function checkDockerVersion(){
     }
 }
 
-async function pullDockerImages() {
+async function pullDockerImages(background = false){
     log.debug("Looking for yaml at: " + BrowserUpPaths.dockerComposeYmlPath());
     log.info("Pulling Docker images");
-    await DockerClient.dockerPull({image: BROWSERUP_DEFAULT_IMAGE, silent: true});
+
+    await DockerClient.dockerPull({imageNameAndTag: BROWSERUP_DEFAULT_IMAGE, background: false});
     await DockerClient.dockerComposePull(
-        {dockerComposePath: BrowserUpPaths.dockerComposeYmlPath(), services:   '', background: true});
+        {dockerComposePath: BrowserUpPaths.dockerComposeYmlPath(), services:   '', background: false});
 }
 
 
-
-
 function displayWelcome(){
     const browserup = chalk.hex("#de792b")("Browser") + chalk.hex("#3a3a3a")("Up ")
     const banner = `
@@ -67,7 +66,7 @@ Launch the cluster and start the test:
 
   ${chalk.blue('browserup load start')}
 
-${chalk.green('View the Test:')}  http://localhost:6730
+${chalk.green('View the Test:')}  http://localhost:23000
 
   ${chalk.green('username:')} superadmin 
   ${chalk.green('password:')} changeme!

lib/config/env.properties

@@ -1,52 +1,52 @@
-S3_MINIO_HOST=minio
-S3_MINIO_PORT_1=6790
-S3_MINIO_PORT_2=6791
-S3_MINIO_ARTIFACTS_BUCKET=artifacts
-S3_MINIO_ACCESS_KEY_ID=minio
-
-RABBITMQ_HOST=rabbitmq
-RABBITMQ_PEER_DISCOVERY_PORT=6769
-RABBITMQ_QUEUE_PORT=6772
-RABBITMQ_MANAGEMENT_PORT=6767
-RABBITMQ_DEFAULT_PASS=just_testing
-
-ZOOKEEPER_HOST=zookeeper
-ZOOKEEPER_CLIENT_PORT=6781
-ZOO_MAX_CLIENT_CNXNS=500
-
-REDIS_HOST=redis
-REDIS_PORT=6892
-
-MYSQL_HOST=mysql
-MYSQL_PORT=3306
-MYSQL_PASSWORD=just_testing
-MYSQL_USERNAME=browserup
-
-WEBCONSOLE_HOST=webconsole
-WEBCONSOLE_PORT=6730
-WEBCONSOLE_PROTOCOL=http
-RAILS_MASTER_KEY=312ad97c276624b8069b61b73aa13a8a
-LOCKBOX_MASTER_KEY=439e901f30a3ce31836dbc81e67411e1f84f43491740ca0f91df4a37a5cd6e8b
-
-GRID_JAVA_API_HOST=grid-java-api
-GRID_JAVA_API_PORT=8080
-
-CHRONOGRAF_HOST=chronograf
-CHRONOGRAF_PORT=6788
-
-INFLUX_DB_HOST=influxdb
-INFLUX_DB_PORT=6786
-INFLUX_DB_NAME=browserup
-INFLUX_DB_USER=browserup
-INFLUX_TEST_DB_HOST=influx-test-db
-INFLUX_TEST_DB_PORT=6786
-INFLUX_DB_PASSWORD=just_testing
-
-S3_MINIO_HOST_PORT_1=9000
-
-GRAFANA_PORT=6799
-GRAFANA_USERNAME=browserup
-GRAFANA_PASSWORD=just_testing
-
-PRIVATE_DNS_NAMESPACE_NAME=browserup-internal.com
-CLUSTER_PUBLIC_IP=localhost
+BROWSERUP_WEBCONSOLE_HOST=webconsole
+BROWSERUP_WEBCONSOLE_PORT=23000
+BROWSERUP_WEBCONSOLE_PROTOCOL=http
+BROWSERUP_RAILS_MASTER_KEY=312ad97c276624b8069b61b73aa13a8a
+BROWSERUP_LOCKBOX_MASTER_KEY=439e901f30a3ce31836dbc81e67411e1f84f43491740ca0f91df4a37a5cd6e8b
+
+BROWSERUP_GRID_JAVA_API_HOST=grid-java-api
+BROWSERUP_GRID_JAVA_API_PORT=23001
+
+BROWSERUP_MYSQL_HOST=mysql
+BROWSERUP_MYSQL_PORT=23002
+BROWSERUP_MYSQL_PASSWORD=just_testing
+BROWSERUP_MYSQL_USERNAME=browserup
+
+BROWSERUP_S3_MINIO_HOST=minio
+BROWSERUP_S3_MINIO_PORT_1=23003
+BROWSERUP_S3_MINIO_PORT_2=23004
+BROWSERUP_S3_MINIO_ARTIFACTS_BUCKET=artifacts
+BROWSERUP_S3_MINIO_ACCESS_KEY_ID=minio
+
+BROWSERUP_RABBITMQ_HOST=rabbitmq
+BROWSERUP_RABBITMQ_PEER_DISCOVERY_PORT=23005
+BROWSERUP_RABBITMQ_QUEUE_PORT=23006
+BROWSERUP_RABBITMQ_MANAGEMENT_PORT=23007
+BROWSERUP_RABBITMQ_DEFAULT_PASS=just_testing
+
+BROWSERUP_ZOOKEEPER_HOST=zookeeper
+BROWSERUP_ZOOKEEPER_CLIENT_PORT=23008
+BROWSERUP_ZOO_MAX_CLIENT_CNXNS=500
+
+BROWSERUP_REDIS_HOST=redis
+BROWSERUP_REDIS_PORT=23009
+
+BROWSERUP_CHRONOGRAF_HOST=chronograf
+BROWSERUP_CHRONOGRAF_PORT=23010
+
+BROWSERUP_INFLUX_DB_HOST=influxdb
+BROWSERUP_INFLUX_DB_PORT=23011
+BROWSERUP_INFLUX_DB_NAME=browserup
+BROWSERUP_INFLUX_DB_USER=browserup
+BROWSERUP_INFLUX_TEST_DB_HOST=influx-test-db
+BROWSERUP_INFLUX_TEST_DB_PORT=23011
+BROWSERUP_INFLUX_DB_PASSWORD=just_testing
+
+BROWSERUP_S3_MINIO_HOST_PORT_1=23012
+
+BROWSERUP_GRAFANA_PORT=23013
+BROWSERUP_GRAFANA_USERNAME=browserup
+BROWSERUP_GRAFANA_PASSWORD=just_testing
+
+BROWSERUP_PRIVATE_DNS_NAMESPACE_NAME=browserup-internal.com
+BROWSERUP_CLUSTER_PUBLIC_IP=localhost