From 6074d706ab9888d11652b8b1d28741f5f6d82d58 Mon Sep 17 00:00:00 2001
From: Daniel <isaac@unif.io>
Date: Thu, 27 Sep 2018 15:20:40 -0700
Subject: [PATCH] Covalence,Terraform, sops Version Bumps

* Updating to covalence version 0.8.3 to address issues with [sops version output handling](https://github.com/unifio/covalence/issues/72)
* Updating terraform to latest 0.11.8
* Updating sops to latest version 3.1.1
* Updating UAT vpc module to properly handle instance_tenancy string.
* Updating APK sgerrand public key URI previous one is no longer available.
---
 .circleci/config.yml                     | 6 +++---
 Dockerfile-infra                         | 2 +-
 Dockerfile-node                          | 2 +-
 tools/covalence/uat/terraform/vpc/vpc.tf | 2 +-
 tools/packer/Dockerfile                  | 2 +-
 tools/terraform/Dockerfile               | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1626982..c2ab7ff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,16 +7,16 @@ common: &common
     CI_REGISTRY: 'unifio/ci'
     CI_MAJOR_VERSION: '3'
     COVALENCE_REGISTRY: 'unifio/covalence'
-    COVALENCE_VERSION: '0.8.1'
+    COVALENCE_VERSION: '0.8.3'
     DUMBINIT_VERSION: '1.2.1'
     GOSU_VERSION: '1.10'
     NODE_VERSION: '8.9.4'
     PACKER_REGISTRY: 'unifio/packer'
     PACKER_VERSION: '1.1.3'
     RUBY_VERSION: '2.5.1'
-    SOPS_VERSION: '3.0.5'
+    SOPS_VERSION: '3.1.1'
     TERRAFORM_REGISTRY: 'unifio/terraform'
-    TERRAFORM_VERSION: '0.11.7'
+    TERRAFORM_VERSION: '0.11.8'
 
 version: 2
 jobs:
diff --git a/Dockerfile-infra b/Dockerfile-infra
index 7586eab..df3fef8 100644
--- a/Dockerfile-infra
+++ b/Dockerfile-infra
@@ -106,7 +106,7 @@ RUN set -ex; \
   cd /tmp/build && \
   \
   # Install glibc
-  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub" && \
+  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" && \
   wget -q "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk" && \
   apk add glibc-2.23-r3.apk && \
   \
diff --git a/Dockerfile-node b/Dockerfile-node
index 175fea3..83ad974 100644
--- a/Dockerfile-node
+++ b/Dockerfile-node
@@ -126,7 +126,7 @@ RUN set -ex; \
   cd /tmp/build && \
   \
   # Install glibc
-  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub" && \
+  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" && \
   wget -q "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk" && \
   apk add glibc-2.23-r3.apk && \
   \
diff --git a/tools/covalence/uat/terraform/vpc/vpc.tf b/tools/covalence/uat/terraform/vpc/vpc.tf
index 60ac2e3..648efd4 100644
--- a/tools/covalence/uat/terraform/vpc/vpc.tf
+++ b/tools/covalence/uat/terraform/vpc/vpc.tf
@@ -20,7 +20,7 @@ provider "aws" {
 
 ## Configures base VPC
 module "vpc_base" {
-  source = "github.com/unifio/terraform-aws-vpc?ref=v0.3.2//base"
+  source = "github.com/unifio/terraform-aws-vpc?ref=v0.3.8//base"
 
   stack_item_label    = "${var.stack_item_label}"
   stack_item_fullname = "${var.stack_item_fullname}"
diff --git a/tools/packer/Dockerfile b/tools/packer/Dockerfile
index 0347e1d..88d9099 100644
--- a/tools/packer/Dockerfile
+++ b/tools/packer/Dockerfile
@@ -40,7 +40,7 @@ RUN set -ex; \
   grep packer_${PACKER_VERSION}_linux_amd64.zip packer_${PACKER_VERSION}_SHA256SUMS | sha256sum -c && \
   unzip -d /usr/local/bin packer_${PACKER_VERSION}_linux_amd64.zip && \
   \
-  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub" && \
+  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" && \
   wget -q "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk" && \
   apk add --no-cache --update glibc-2.23-r3.apk && \
   \
diff --git a/tools/terraform/Dockerfile b/tools/terraform/Dockerfile
index e41b898..40c0c34 100644
--- a/tools/terraform/Dockerfile
+++ b/tools/terraform/Dockerfile
@@ -42,7 +42,7 @@ RUN set -ex; \
   grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VERSION}_SHA256SUMS | sha256sum -c && \
   unzip -d /usr/local/bin terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
   \
-  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub" && \
+  wget -q -O /etc/apk/keys/sgerrand.rsa.pub "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" && \
   wget -q "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk" && \
   apk add --no-cache --update glibc-2.23-r3.apk && \
   \