From 5beb96294589b93b203e9ae001d91f6e4af92672 Mon Sep 17 00:00:00 2001 From: Cyril Dubuisson Date: Tue, 18 Jun 2019 17:53:46 +0200 Subject: [PATCH] :whale: : rollback to terraform image 0.11.14 --- src/main/java/io/codeka/gaia/runner/StackRunner.java | 2 +- src/main/java/io/codeka/gaia/runner/config/DockerConfig.java | 2 +- src/main/resources/templates/stack.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/codeka/gaia/runner/StackRunner.java b/src/main/java/io/codeka/gaia/runner/StackRunner.java index 040f635df..7f2da8548 100644 --- a/src/main/java/io/codeka/gaia/runner/StackRunner.java +++ b/src/main/java/io/codeka/gaia/runner/StackRunner.java @@ -60,7 +60,7 @@ private int runContainerForJob(Job job, String script){ .build(); // pull the image - dockerClient.pull("hashicorp/terraform:latest"); + dockerClient.pull("hashicorp/terraform:0.11.14"); System.out.println("Create container"); var containerCreation = dockerClient.createContainer(containerConfig); diff --git a/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java b/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java index 2a0d1954b..ec0751de4 100644 --- a/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java +++ b/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java @@ -30,7 +30,7 @@ DockerClient client(Settings settings) { @Bean ContainerConfig.Builder containerConfig(){ return ContainerConfig.builder() - .image("hashicorp/terraform:latest") + .image("hashicorp/terraform:0.11.14") // bind mounting the docker sock (to be able to use docker provider in terraform) .hostConfig(HostConfig.builder().binds(HostConfig.Bind.builder().from("/var/run/docker.sock").to("/var/run/docker.sock").build()).build()) // resetting entrypoint to empty diff --git a/src/main/resources/templates/stack.html b/src/main/resources/templates/stack.html index 8510783fa..a1f24fd3a 100644 --- a/src/main/resources/templates/stack.html +++ b/src/main/resources/templates/stack.html @@ -204,7 +204,7 @@

Job history

return $.get(`/api/state/${stackId}`) .then(data => { // finding stack output - stack.outputs = data.outputs; + stack.outputs = data.modules[0].outputs; }) .catch(e => { // a 404 means that the stack is new