Upgrade terraform + add ovh plugin

manala · Mar 10, 2020 · 21dda69 · 21dda69
1 parent 325e0e5
commit 21dda69
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/elao.infra/.manala/docker/Dockerfile.terraform.tmpl b/elao.infra/.manala/docker/Dockerfile.terraform.tmpl
@@ -1,21 +1,37 @@
 FROM golang:alpine3.9 AS provider-openstack
 
 RUN apk add --no-cache git \
-	&& go get -d -v github.com/terraform-providers/terraform-provider-openstack \
-	&& git -C ./src/github.com/terraform-providers/terraform-provider-openstack checkout v1.24.0 \
-	&& go install ./src/github.com/terraform-providers/terraform-provider-openstack
+    && go get -d -v github.com/terraform-providers/terraform-provider-openstack \
+    && git -C ./src/github.com/terraform-providers/terraform-provider-openstack checkout v1.26.0 \
+    && go install ./src/github.com/terraform-providers/terraform-provider-openstack
 
 FROM golang:alpine3.9 AS provider-gandi
 
 RUN apk add --no-cache git make bash \
-	&& git clone https://github.com/tiramiseb/terraform-provider-gandi.git \
-	&& git -C ./terraform-provider-gandi checkout v1.1.1 \
-	&& cd terraform-provider-gandi/ && make -f GNUmakefile build
+    && git clone https://github.com/tiramiseb/terraform-provider-gandi.git \
+    && git -C ./terraform-provider-gandi checkout v1.1.1 \
+    && cd terraform-provider-gandi/ && make -f GNUmakefile build
+
+FROM golang:alpine3.9 AS provider-ovh
+
+RUN apk add --no-cache git make bash \
+    && git clone https://github.com/terraform-providers/terraform-provider-ovh.git \
+    && git -C ./terraform-provider-ovh checkout v0.7.0 \
+    && cd terraform-provider-ovh/ && make build
+
+FROM golang:alpine3.9 AS provider-template
+
+RUN apk add --no-cache git \
+    && go get -d -v github.com/terraform-providers/terraform-provider-template \
+    && git -C ./src/github.com/terraform-providers/terraform-provider-template checkout v2.1.2 \
+    && go install ./src/github.com/terraform-providers/terraform-provider-template
 
 FROM hashicorp/terraform:{{ .Vars.system.terraform.version }}
 
 COPY --from=provider-openstack /go/bin/terraform-provider-openstack /bin
 COPY --from=provider-gandi /go/bin/terraform-provider-gandi /bin
+COPY --from=provider-ovh /go/bin/terraform-provider-ovh /bin
+COPY --from=provider-template /go/bin/terraform-provider-template /bin
 
 RUN apk add --no-cache zsh
 RUN sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"

diff --git a/elao.infra/.manala/docker/docker-compose.yaml.tmpl b/elao.infra/.manala/docker/docker-compose.yaml.tmpl
@@ -28,7 +28,8 @@ services:
       context: .
       dockerfile: Dockerfile.terraform
     environment:
-      OVH_PC:
+      OVH_PROJECT:
+      OVH_PROJECT_ID:
       OS_TOKEN:
       AWS_SESSION_TOKEN:
       AWS_ACCESS_KEY_ID: AKIARXWTWAJ4KAGCSOR7

diff --git a/elao.infra/.manala/docker/etc/terraform/zshrc b/elao.infra/.manala/docker/etc/terraform/zshrc
@@ -9,3 +9,4 @@ plugins=(git terraform)
 source $ZSH/oh-my-zsh.sh
 
 alias tf="/bin/terraform"
+PROMPT='%a${OVH_PROJECT:-"Unauthenticated"}@%F{yellow}terraform%f%b:%F{blue}%B%~%b%f '