Skip to content

Commit 103c34a

Browse files
dani-garciadani-garcia
authored
Merge pull request dani-garcia#868 from jjlin/alt-base
Add backend support for alternate base dir (subdir/subpath) hosting
2 parents 22f9b8f + bd5824c commit 103c34a

34 files changed

+125
-94
lines changed

‎docker/Dockerfile.j2‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{% endif %}
3232
FROM {{ vault_stage_base_image }} as vault
3333

34-
ENV VAULT_VERSION "v2.12.0c"
34+
ENV VAULT_VERSION "v2.12.0d"
3535

3636
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
3737

@@ -42,8 +42,7 @@ RUN apk add --no-cache --upgrade curl tar
4242
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
4343
{% endif %}
4444

45-
RUN mkdir /web-vault
46-
WORKDIR /web-vault
45+
WORKDIR /
4746

4847
{% if "alpine" in vault_stage_base_image %}
4948
SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]

‎docker/aarch64/mysql/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

‎docker/aarch64/sqlite/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

‎docker/amd64/mysql/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

‎docker/amd64/mysql/Dockerfile.alpine‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM alpine:3.11 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
RUN apk add --no-cache --upgrade curl tar
1515

16-
RUN mkdir /web-vault
17-
WORKDIR /web-vault
16+
WORKDIR /
1817

1918
SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2019

‎docker/amd64/postgresql/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

‎docker/amd64/postgresql/Dockerfile.alpine‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM alpine:3.11 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
RUN apk add --no-cache --upgrade curl tar
1515

16-
RUN mkdir /web-vault
17-
WORKDIR /web-vault
16+
WORKDIR /
1817

1918
SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2019

‎docker/amd64/sqlite/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

‎docker/amd64/sqlite/Dockerfile.alpine‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM alpine:3.11 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
RUN apk add --no-cache --upgrade curl tar
1515

16-
RUN mkdir /web-vault
17-
WORKDIR /web-vault
16+
WORKDIR /
1817

1918
SHELL ["/bin/ash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2019

‎docker/armv6/mysql/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
####################### VAULT BUILD IMAGE #######################
88
FROM rust:1.40 as vault
99

10-
ENV VAULT_VERSION "v2.12.0c"
10+
ENV VAULT_VERSION "v2.12.0d"
1111

1212
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
1313

1414
# Build time options to avoid dpkg warnings and help with reproducible builds.
1515
ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 TZ=UTC TERM=xterm-256color
1616

17-
RUN mkdir /web-vault
18-
WORKDIR /web-vault
17+
WORKDIR /
1918

2019
SHELL ["/bin/bash", "-o", "nounset", "-o", "pipefail", "-o", "errexit", "-c"]
2120

0 commit comments

Comments
 (0)