Update Vault #11978
Merged
Update Vault #11978
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for dc134c6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index bbef15b..030aa0e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,22 +1,22 @@
Maintainers: Jim Kalafut <jkalafut@hashicorp.com> (@kalafut), Meggie Ladlow <meggie@hashicorp.com> (@mladlow), Calvin Leung Huang <calvin@hashicorp.com> (@calvn), Nick Cabatoff <ncabatoff@hashicorp.com> (@ncabatoff)
GitRepo: https://github.com/hashicorp/docker-vault.git
-Tags: 1.6.7
+Tags: 1.7.10
Architectures: amd64, arm32v6, arm64v8, i386
-GitCommit: ee3213df631000172da382184a516a72a7266b76
+GitCommit: dd76bb48eba5f804dc9d2cb7501e9634708f4417
Directory: 0.X
-Tags: 1.7.9
+Tags: 1.8.9
Architectures: amd64, arm32v6, arm64v8, i386
-GitCommit: b38a7e416ccb5c516b341a7957d9f9ce7df2230d
+GitCommit: 87e0840fd8f8a148ec8f023669b304bbd8524215
Directory: 0.X
-Tags: 1.8.8
+Tags: 1.9.4, latest
Architectures: amd64, arm32v6, arm64v8, i386
-GitCommit: a600cc5a786bede32bbd53c86a88cbb2898ed00f
+GitCommit: 3e7407f153474dacbeffe94323c9eb41e8186457
Directory: 0.X
-Tags: 1.9.3, latest
+Tags: 1.10.0-rc1
Architectures: amd64, arm32v6, arm64v8, i386
-GitCommit: fca519d5cb74d47f18559fbd3dbca6b8feee8fae
+GitCommit: 43556c0d391c474ae2d357828fb3a74bbc22b903
Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index 8a3e934..e22dec2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
-vault:1.6.7
-vault:1.7.9
-vault:1.8.8
-vault:1.9.3
+vault:1.7.10
+vault:1.8.9
+vault:1.9.4
+vault:1.10.0-rc1
vault:latest
diff --git a/vault_1.8.8/Dockerfile b/vault_1.10.0-rc1/Dockerfile
similarity index 96%
rename from vault_1.8.8/Dockerfile
rename to vault_1.10.0-rc1/Dockerfile
index 86f0697..3066bac 100644
--- a/vault_1.8.8/Dockerfile
+++ b/vault_1.10.0-rc1/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.14
# This is the release of Vault to pull in.
-ARG VAULT_VERSION=1.8.8
+ARG VAULT_VERSION=1.10.0-rc1
# 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.
@@ -22,9 +22,9 @@ RUN set -eux; \
VAULT_GPGKEY=C874011F0AB405110D02105534365D9472D7468F; \
found=''; \
for server in \
- hkp://p80.pool.sks-keyservers.net:80 \
- hkp://keyserver.ubuntu.com:80 \
- hkp://pgp.mit.edu:80 \
+ hkps://keys.openpgp.org \
+ hkps://keyserver.ubuntu.com \
+ hkps://pgp.mit.edu \
; do \
echo "Fetching GPG key $VAULT_GPGKEY from $server"; \
gpg --batch --keyserver "$server" --recv-keys "$VAULT_GPGKEY" && found=yes && break; \
diff --git a/vault_1.6.7/docker-entrypoint.sh b/vault_1.10.0-rc1/docker-entrypoint.sh
similarity index 98%
rename from vault_1.6.7/docker-entrypoint.sh
rename to vault_1.10.0-rc1/docker-entrypoint.sh
index 81214cb..3b72da2 100755
--- a/vault_1.6.7/docker-entrypoint.sh
+++ b/vault_1.10.0-rc1/docker-entrypoint.sh
@@ -91,7 +91,7 @@ if [ "$1" = 'vault' ]; then
# In the case vault has been started in a container without IPC_LOCK privileges
if ! vault -version 1>/dev/null 2>/dev/null; then
- >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --privileged or --cap-add IPC_LOCK"
+ >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --cap-add IPC_LOCK"
setcap cap_ipc_lock=-ep $(readlink -f $(which vault))
fi
fi
diff --git a/vault_1.7.9/Dockerfile b/vault_1.7.10/Dockerfile
similarity index 96%
rename from vault_1.7.9/Dockerfile
rename to vault_1.7.10/Dockerfile
index b742de2..fad9fbc 100644
--- a/vault_1.7.9/Dockerfile
+++ b/vault_1.7.10/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.14
# This is the release of Vault to pull in.
-ARG VAULT_VERSION=1.7.9
+ARG VAULT_VERSION=1.7.10
# 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.
@@ -22,9 +22,9 @@ RUN set -eux; \
VAULT_GPGKEY=C874011F0AB405110D02105534365D9472D7468F; \
found=''; \
for server in \
- hkp://p80.pool.sks-keyservers.net:80 \
- hkp://keyserver.ubuntu.com:80 \
- hkp://pgp.mit.edu:80 \
+ hkps://keys.openpgp.org \
+ hkps://keyserver.ubuntu.com \
+ hkps://pgp.mit.edu \
; do \
echo "Fetching GPG key $VAULT_GPGKEY from $server"; \
gpg --batch --keyserver "$server" --recv-keys "$VAULT_GPGKEY" && found=yes && break; \
diff --git a/vault_1.8.8/docker-entrypoint.sh b/vault_1.7.10/docker-entrypoint.sh
similarity index 98%
rename from vault_1.8.8/docker-entrypoint.sh
rename to vault_1.7.10/docker-entrypoint.sh
index 81214cb..3b72da2 100755
--- a/vault_1.8.8/docker-entrypoint.sh
+++ b/vault_1.7.10/docker-entrypoint.sh
@@ -91,7 +91,7 @@ if [ "$1" = 'vault' ]; then
# In the case vault has been started in a container without IPC_LOCK privileges
if ! vault -version 1>/dev/null 2>/dev/null; then
- >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --privileged or --cap-add IPC_LOCK"
+ >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --cap-add IPC_LOCK"
setcap cap_ipc_lock=-ep $(readlink -f $(which vault))
fi
fi
diff --git a/vault_1.6.7/Dockerfile b/vault_1.8.9/Dockerfile
similarity index 96%
rename from vault_1.6.7/Dockerfile
rename to vault_1.8.9/Dockerfile
index 8972555..eab002e 100644
--- a/vault_1.6.7/Dockerfile
+++ b/vault_1.8.9/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.14
# This is the release of Vault to pull in.
-ARG VAULT_VERSION=1.6.7
+ARG VAULT_VERSION=1.8.9
# 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.
@@ -22,9 +22,9 @@ RUN set -eux; \
VAULT_GPGKEY=C874011F0AB405110D02105534365D9472D7468F; \
found=''; \
for server in \
- hkp://p80.pool.sks-keyservers.net:80 \
- hkp://keyserver.ubuntu.com:80 \
- hkp://pgp.mit.edu:80 \
+ hkps://keys.openpgp.org \
+ hkps://keyserver.ubuntu.com \
+ hkps://pgp.mit.edu \
; do \
echo "Fetching GPG key $VAULT_GPGKEY from $server"; \
gpg --batch --keyserver "$server" --recv-keys "$VAULT_GPGKEY" && found=yes && break; \
diff --git a/vault_1.7.9/docker-entrypoint.sh b/vault_1.8.9/docker-entrypoint.sh
similarity index 98%
rename from vault_1.7.9/docker-entrypoint.sh
rename to vault_1.8.9/docker-entrypoint.sh
index 81214cb..3b72da2 100755
--- a/vault_1.7.9/docker-entrypoint.sh
+++ b/vault_1.8.9/docker-entrypoint.sh
@@ -91,7 +91,7 @@ if [ "$1" = 'vault' ]; then
# In the case vault has been started in a container without IPC_LOCK privileges
if ! vault -version 1>/dev/null 2>/dev/null; then
- >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --privileged or --cap-add IPC_LOCK"
+ >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --cap-add IPC_LOCK"
setcap cap_ipc_lock=-ep $(readlink -f $(which vault))
fi
fi
diff --git a/vault_latest/Dockerfile b/vault_latest/Dockerfile
index fe917ae..659104a 100644
--- a/vault_latest/Dockerfile
+++ b/vault_latest/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.14
# This is the release of Vault to pull in.
-ARG VAULT_VERSION=1.9.3
+ARG VAULT_VERSION=1.9.4
# 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.
@@ -22,9 +22,9 @@ RUN set -eux; \
VAULT_GPGKEY=C874011F0AB405110D02105534365D9472D7468F; \
found=''; \
for server in \
- hkp://p80.pool.sks-keyservers.net:80 \
- hkp://keyserver.ubuntu.com:80 \
- hkp://pgp.mit.edu:80 \
+ hkps://keys.openpgp.org \
+ hkps://keyserver.ubuntu.com \
+ hkps://pgp.mit.edu \
; do \
echo "Fetching GPG key $VAULT_GPGKEY from $server"; \
gpg --batch --keyserver "$server" --recv-keys "$VAULT_GPGKEY" && found=yes && break; \
diff --git a/vault_latest/docker-entrypoint.sh b/vault_latest/docker-entrypoint.sh
index 81214cb..3b72da2 100755
--- a/vault_latest/docker-entrypoint.sh
+++ b/vault_latest/docker-entrypoint.sh
@@ -91,7 +91,7 @@ if [ "$1" = 'vault' ]; then
# In the case vault has been started in a container without IPC_LOCK privileges
if ! vault -version 1>/dev/null 2>/dev/null; then
- >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --privileged or --cap-add IPC_LOCK"
+ >&2 echo "Couldn't start vault with IPC_LOCK. Disabling IPC_LOCK, please use --cap-add IPC_LOCK"
setcap cap_ipc_lock=-ep $(readlink -f $(which vault))
fi
fiRelevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.