Merge pull request #67 in ASAPO/asapo from feature_clients-devops to develop

* commit 'f228dbee':
  update configuration
  add license info
  update test, move asapo client template to submodule
  refactor docker images, add examples
  improve output
  add nginx and co to the image
  refactor deploy scripts#

deploy/asapo/Dockerfile → deploy/nomad_consul_docker/Dockerfile

@@ -46,11 +46,9 @@ RUN mkdir -p /var/log/supervisord/ /etc/consul.d /etc/nomad.d
 
 COPY scripts/ /var/run/asapo/
 
-RUN cd /var/run/asapo asapo && terraform init
+RUN cd /var/run/asapo && terraform init
 
-COPY asapo-*  /usr/bin/
-
-COPY *.sh  asapo_overwrite_vars.tfvars /tmp/asapo_runscripts/
+COPY jobs-*  /usr/bin/
 
 COPY *.py  /etc/asapo/
 COPY *.hcl.tpl  /etc/asapo/

deploy/nomad_consul_docker/build_image.sh

+#!/usr/bin/env bash
+docker build -t yakser/asapo-nomad-cluster .
+docker push yakser/asapo-nomad-cluster
+

deploy/asapo/asapo-start → deploy/nomad_consul_docker/jobs-start

 #!/usr/bin/env bash
 
-if [ ! -f  /var/nomad/token ]; then
-	nomad acl bootstrap > /var/nomad/bootstrap
-	cat /var/nomad/bootstrap | grep Secret | awk '{print $4}' > /var/nomad/token
-	cp /var/nomad/token $TF_VAR_service_dir/nomad_token
+if [ ! -f  /var/nomad/token ] && [ "${ACL_ENABLED}" = "true" ]; then
+	nomad acl bootstrap > /var/nomad/bootstrap && \
+	cat /var/nomad/bootstrap | grep Secret | awk '{print $4}' > /var/nomad/token && \
+	cp /var/nomad/token $NOMAD_ALLOC_DIR/nomad_token
 fi
 
 if [ -f /var/run/asapo/user_vars.tfvars ]; then
   USER_VAR_FILE="-var-file=/var/run/asapo/user_vars.tfvars"
 fi
 
-cd /var/run/asapo && terraform apply -auto-approve $USER_VAR_FILE "$@"
\ No newline at end of file
+cd /var/run/asapo && terraform apply -auto-approve $USER_VAR_FILE "$@"
+
+if [ "${ACL_ENABLED}" = "true" ]; then
+	cat /var/nomad/token
+fi