diff --git a/docker-demo-3/scripts/jenkins-init.sh b/docker-demo-3/scripts/jenkins-init.sh index 5de5f02..88e2b3e 100644 --- a/docker-demo-3/scripts/jenkins-init.sh +++ b/docker-demo-3/scripts/jenkins-init.sh @@ -45,9 +45,11 @@ rm -f get-pip.py pip install awscli # install terraform -cd /usr/local/bin -wget -q https://releases.hashicorp.com/terraform/0.7.7/terraform_0.7.7_linux_amd64.zip -unzip terraform_0.7.7_linux_amd64.zip +TERRAFORM_VERSION="0.11.7" +wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ +&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \ +&& rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip + # clean up apt-get clean rm terraform_0.7.7_linux_amd64.zip diff --git a/jenkins-packer-demo/output.tf b/jenkins-packer-demo/output.tf index 4c9668a..1a3f26e 100644 --- a/jenkins-packer-demo/output.tf +++ b/jenkins-packer-demo/output.tf @@ -1,6 +1,6 @@ output "jenkins-ip" { - value = "${aws_instance.jenkins-instance.*.public_ip}" + value = ["${aws_instance.jenkins-instance.*.public_ip}"] } output "app-ip" { - value = "${aws_instance.app-instance.*.public_ip}" + value = ["${aws_instance.app-instance.*.public_ip}"] } diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh index da54c2f..91767f6 100644 --- a/jenkins-packer-demo/scripts/jenkins-init.sh +++ b/jenkins-packer-demo/scripts/jenkins-init.sh @@ -39,10 +39,13 @@ rm -f get-pip.py pip install awscli # install terraform -cd /usr/local/bin -wget -q https://releases.hashicorp.com/terraform/0.7.7/terraform_0.7.7_linux_amd64.zip -unzip terraform_0.7.7_linux_amd64.zip +TERRAFORM_VERSION="0.11.7" +wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ +&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \ +&& rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip + # install packer +cd /usr/local/bin wget -q https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.zip unzip packer_0.10.2_linux_amd64.zip # clean up