version in aspo-cluster docker file

CMakeModules/prepare_version_tag.cmake

@@ -23,6 +23,13 @@ endfunction()
 
 cleanup(BRANCH)
 
+if (${BRANCH} STREQUAL "master")
+    SET (ASAPO_VERSION_DOCKER_SUFFIX "")
+else()
+    SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
+endif()
+
+
 
 if (${BRANCH} STREQUAL "develop")
     SET (ASAPO_VERSION_PYTHON ${VERSION_TAGS}.${BRANCH}.${VERSION_COMMIT})

deploy/CMakeLists.txt

@@ -7,5 +7,9 @@ endif()
 configure_files(${CMAKE_CURRENT_SOURCE_DIR}/nomad_jobs ${CMAKE_CURRENT_BINARY_DIR}/nomad_jobs)
 
 
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/docker/cluster ${CMAKE_CURRENT_BINARY_DIR}/docker/cluster)
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/docker/cluster/scripts ${CMAKE_CURRENT_BINARY_DIR}/docker/cluster/scripts)
+
+
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/nomad_jobs/ DESTINATION ${NOMAD_INSTALL})
 

deploy/docker/cluster/scripts/asapo.auto.tfvars

-nginx_version = "1.14"
-elasticsearch_version = "6.3.0"
-kibana_version = "6.3.0"
-mongo_version = "4.0.0"
-
-
-asapo_imagename_suffix="-dev"
-asapo_image_tag = "feature_virtualized-deployment.latest"
-
-
-

deploy/docker/cluster/scripts/asapo.auto.tfvars.in

+asapo_imagename_suffix="@ASAPO_VERSION_DOCKER_SUFFIX@"
+asapo_image_tag = "@ASAPO_VERSION@"
+
+
+nginx_version = "1.14"
+elasticsearch_version = "6.3.0"
+kibana_version = "6.3.0"
+mongo_version = "4.0.0"
+grafana_version="latest"
+influxdb_version = "latest"
+elk_logs = true
+
+
+
+job_scripts_dir = "/var/run/asapo"
+
+receiver_total_memory_size = "2000"
+
+receiver_dataserver_cache_size = "1" #gb
+grafana_total_memory_size = "256"
+
+influxdb_total_memory_size = "256"
+
+fluentd_total_memory_size = 256
+elasticsearch_total_memory_size = 256
+kibana_total_memory_size = 256
+mongo_total_memory_size = 256
+authorizer_total_memory_size = 256
+discovery_total_memory_size = 256
+
+
+grafana_port = 3000
+influxdb_port = 8086
+mongo_port = 27017
+fluentd_port = 9880
+fluentd_port_stream = 24224
+elasticsearch_port = 9200
+kibana_port = 5601
+discovery_port = 5006
+authorizer_port = 5007
+
+
+

deploy/docker/cluster/scripts/vars.tf

-variable "elk_logs" {
- default = true
-}
+variable "elk_logs" {}
 
-variable "nginx_version" {
-  default = "latest"
-}
+variable "nginx_version" {}
 
-variable "grafana_version" {
-  default = "latest"
-}
+variable "grafana_version" {}
 
-variable "elasticsearch_version" {
-  default = "latest"
-}
+variable "elasticsearch_version" {}
 
-variable "kibana_version" {
-  default = "latest"
-}
+variable "kibana_version" {}
 
-variable "influxdb_version" {
-  default = "latest"
-}
+variable "influxdb_version" {}
 
-variable "mongo_version" {
-  default = "latest"
-}
+variable "mongo_version" {}
 
-variable "asapo_imagename_suffix" {
-  default = ""
-}
+variable "asapo_imagename_suffix" {}
 
-variable "asapo_image_tag" {
-#  default = "latest"
-}
+variable "asapo_image_tag" {}
 
-variable "job_scripts_dir" {
-  default = "/var/run/asapo"
-}
+variable "job_scripts_dir" {}
 
-variable "service_dir" {
-}
+variable "service_dir" {}
 
-variable "data_dir" {
-}
+variable "data_dir" {}
 
-variable "receiver_total_memory_size" {
-  default = "2000" #mb
-}
+variable "receiver_total_memory_size" {}
 
-variable "receiver_dataserver_cache_size" {
-  default = "1"
-}
+variable "receiver_dataserver_cache_size" {}
 
-variable "grafana_total_memory_size" {
-  default = "256" #mb
-}
+variable "grafana_total_memory_size" {}
 
-variable "influxdb_total_memory_size" {
-  default = "256" #mb
-}
+variable "influxdb_total_memory_size" {}
 
-variable "fluentd_total_memory_size" {
-  default = "256"
-}
+variable "fluentd_total_memory_size" {}
 
-variable "elasticsearch_total_memory_size" {
-  default = "256"
-}
+variable "elasticsearch_total_memory_size" {}
 
-variable "kibana_total_memory_size" {
-  default = "256"
-}
+variable "kibana_total_memory_size" {}
 
-variable "mongo_total_memory_size" {
-  default = "300"
-}
+variable "mongo_total_memory_size" {}
 
-variable "authorizer_total_memory_size" {
-  default = "256"
-}
+variable "authorizer_total_memory_size" {}
 
-variable "discovery_total_memory_size" {
-  default = "256"
-}
+variable "discovery_total_memory_size" {}
 
-variable "grafana_port" {
-  default = "3000"
-}
+variable "grafana_port" {}
 
-variable "influxdb_port" {
-  default = "8086"
-}
+variable "influxdb_port" {}
 
-variable "mongo_port" {
-  default = "27017"
-}
+variable "mongo_port" {}
 
-variable "fluentd_port" {
-  default = "9880"
-}
+variable "fluentd_port" {}
 
-variable "fluentd_port_stream" {
-  default = "24224"
-}
+variable "fluentd_port_stream" {}
 
-variable "elasticsearch_port" {
-  default = "9200"
-}
+variable "elasticsearch_port" {}
 
-variable "kibana_port" {
-  default = "5601"
-}
+variable "kibana_port" {}
 
-variable "discovery_port" {
-  default = "5006"
-}
+variable "discovery_port" {}
 
-variable "authorizer_port" {
-  default = "5007"
-}
+variable "authorizer_port" {}
\ No newline at end of file