Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Vault for 1.8.0-rc2 #10541

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Update Vault for 1.8.0-rc2 #10541

merged 1 commit into from
Jul 14, 2021

Conversation

mladlow
Copy link
Contributor

@mladlow mladlow commented Jul 14, 2021

No description provided.

@github-actions
Copy link

Diff for 7eb578e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9d91c81..02b4d83 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,7 +16,7 @@ Architectures: amd64, arm32v6, arm64v8, i386
 GitCommit: d35c24ced09941188833c420c3d300c94cd97345
 Directory: 0.X
 
-Tags: 1.8.0-rc1
+Tags: 1.8.0-rc2
 Architectures: amd64, arm32v6, arm64v8, i386
-GitCommit: 14e6ef0801b26aef7cd8d4c3fd52f552c6f6b897
+GitCommit: bdd23b0c75add997d0247e3d7fb72338f240fa70
 Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index d188560..1116570 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
 vault:1.5.9
 vault:1.6.5
 vault:1.7.3
-vault:1.8.0-rc1
+vault:1.8.0-rc2
 vault:latest
diff --git a/vault_1.8.0-rc1/Dockerfile b/vault_1.8.0-rc2/Dockerfile
similarity index 87%
rename from vault_1.8.0-rc1/Dockerfile
rename to vault_1.8.0-rc2/Dockerfile
index 3cd2a3e..b5fc178 100644
--- a/vault_1.8.0-rc1/Dockerfile
+++ b/vault_1.8.0-rc2/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.13
 
 # This is the release of Vault to pull in.
-ARG VAULT_VERSION=1.8.0-rc1
+ARG VAULT_VERSION=1.8.0-rc2
 
 # Create a vault user and group first so the IDs get set the same way,
 # even as the rest of this may change over time.
@@ -37,7 +37,10 @@ RUN set -eux; \
     wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS.sig && \
     gpg --batch --verify vault_${VAULT_VERSION}_SHA256SUMS.sig vault_${VAULT_VERSION}_SHA256SUMS && \
     grep vault_${VAULT_VERSION}_linux_${ARCH}.zip vault_${VAULT_VERSION}_SHA256SUMS | sha256sum -c && \
-    unzip -d /bin vault_${VAULT_VERSION}_linux_${ARCH}.zip && \
+    unzip -d /tmp/build vault_${VAULT_VERSION}_linux_${ARCH}.zip && \
+    cp /tmp/build/vault /bin/vault && \
+    if [ -f /tmp/build/EULA.txt ]; then mkdir -p /usr/share/doc/vault; mv /tmp/build/EULA.txt /usr/share/doc/vault/EULA.txt; fi && \
+    if [ -f /tmp/build/TermsOfEvaluation.txt ]; then mkdir -p /usr/share/doc/vault; mv /tmp/build/TermsOfEvaluation.txt /usr/share/doc/vault/TermsOfEvaluation.txt; fi && \ 
     cd /tmp && \
     rm -rf /tmp/build && \
     gpgconf --kill dirmngr && \
diff --git a/vault_1.8.0-rc1/docker-entrypoint.sh b/vault_1.8.0-rc2/docker-entrypoint.sh
similarity index 100%
rename from vault_1.8.0-rc1/docker-entrypoint.sh
rename to vault_1.8.0-rc2/docker-entrypoint.sh

@yosifkit yosifkit merged commit eb920e8 into docker-library:master Jul 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants