From 098a435b64d6eb3c0310778dc5c8b14856977865 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 12 Apr 2018 18:37:50 -0400 Subject: [PATCH] fix latest versions and vault Signed-off-by: Jess Frazelle --- latest-versions.sh | 4 +++- vault/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/latest-versions.sh b/latest-versions.sh index 06f2e1a..26d0512 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -84,7 +84,9 @@ compare() { echo -e "\e[36m${dir}:\e[39m current ${current} | ${tag} | ${name}" else # add to the bad versions - bad_versions+=( "${dir}" ) + if [[ "$dir" != "rstudio" ]]; then + bad_versions+=( "${dir}" ) + fi echo -e "\e[31m${dir}:\e[39m current ${current} | ${tag} | ${name} | ${releases}" fi } diff --git a/vault/Dockerfile b/vault/Dockerfile index 50e0604..5d45315 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -18,6 +18,7 @@ RUN buildDeps=' \ libc-dev \ libgcc \ make \ + yarn \ zip \ ' \ set -x \ @@ -26,7 +27,8 @@ RUN buildDeps=' \ && git clone --depth 1 --branch ${VAULT_VERSION} https://github.com/hashicorp/vault /go/src/github.com/hashicorp/vault \ && cd /go/src/github.com/hashicorp/vault \ && go get github.com/mitchellh/gox \ - && XC_ARCH="amd64" XC_OS="linux" XC_OSARCH="linux/amd64" make bin \ + && yarn add bower \ + && XC_ARCH="amd64" XC_OS="linux" XC_OSARCH="linux/amd64" make bootstrap static-dist bin \ && mv bin/vault /usr/bin/ \ && apk del $buildDeps \ && rm -rf /go \