Skip to content

Commit

Permalink
Covalence,Terraform, sops Version Bumps
Browse files Browse the repository at this point in the history 
* Updating to covalence version 0.8.3 to address issues with [sops version output handling](unifio/covalence#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.
  • Loading branch information
@disaac
disaac committed Sep 27, 2018
1 parent 5238bc8 commit 6074d70
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-infra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
\
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-node
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
\
Expand Down
2 changes: 1 addition & 1 deletion tools/covalence/uat/terraform/vpc/vpc.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion tools/packer/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
\
Expand Down
2 changes: 1 addition & 1 deletion tools/terraform/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
\
Expand Down