From 0a3008e7538c1a29b8b5a6439004e89465fce391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Sat, 22 Feb 2020 16:00:43 +0100 Subject: [PATCH] Update web vault used in docker --- docker/Dockerfile.j2 | 5 ++--- docker/aarch64/mysql/Dockerfile | 5 ++--- docker/aarch64/sqlite/Dockerfile | 5 ++--- docker/amd64/mysql/Dockerfile | 5 ++--- docker/amd64/mysql/Dockerfile.alpine | 5 ++--- docker/amd64/postgresql/Dockerfile | 5 ++--- docker/amd64/postgresql/Dockerfile.alpine | 5 ++--- docker/amd64/sqlite/Dockerfile | 5 ++--- docker/amd64/sqlite/Dockerfile.alpine | 5 ++--- docker/armv6/mysql/Dockerfile | 5 ++--- docker/armv6/sqlite/Dockerfile | 5 ++--- docker/armv7/mysql/Dockerfile | 5 ++--- docker/armv7/sqlite/Dockerfile | 5 ++--- 13 files changed, 26 insertions(+), 39 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 7ce2d4eb..cdf83eeb 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -31,7 +31,7 @@ {% endif %} FROM {{ vault_stage_base_image }} as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" @@ -42,8 +42,7 @@ RUN apk add --no-cache --upgrade curl tar ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color {% endif %} -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / {% if "alpine" in vault_stage_base_image %} SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 58cdf3ba..14a0cbff 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index b7637157..0c2e7dbf 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index 4949f816..6e12db2b 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 6ea0f0a9..9bc6a51e 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -7,14 +7,13 @@ ####################### VAULT BUILD IMAGE ####################### FROM alpine:3.11 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" RUN apk add --no-cache --upgrade curl tar -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile index 2418cb60..8428de9e 100644 --- a/docker/amd64/postgresql/Dockerfile +++ b/docker/amd64/postgresql/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine index 72dd66d0..12f2e529 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -7,14 +7,13 @@ ####################### VAULT BUILD IMAGE ####################### FROM alpine:3.11 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" RUN apk add --no-cache --upgrade curl tar -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index ba09eec1..e120c18e 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index 99cab519..8cd9251e 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -7,14 +7,13 @@ ####################### VAULT BUILD IMAGE ####################### FROM alpine:3.11 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" RUN apk add --no-cache --upgrade curl tar -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 427b03a6..d55e12b9 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 8aa58270..ee6b5902 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index fb718c0a..c486595f 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"] diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index d1b6aaf1..7cce852d 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -7,15 +7,14 @@ ####################### VAULT BUILD IMAGE ####################### FROM rust:1.40 as vault -ENV VAULT_VERSION "v2.12.0c" +ENV VAULT_VERSION "v2.12.0d" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" # Build time options to avoid dpkg warnings and help with reproducible builds. ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color -RUN mkdir /web-vault -WORKDIR /web-vault +WORKDIR / SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]