diff --git a/CHANGELOG.md b/CHANGELOG.md index d2abce4..3c2e9a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## v1.1.4 (Unreleased) +## v1.1.4 (2022-01-03) - Support for optional SSL mode within init script - Support for optional kv-v2 engine within init script - Include vault-agent init script diff --git a/Dockerfile b/Dockerfile index d3eccef..e6f18e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,6 @@ VOLUME /vault/plugins COPY --from=builder /plugin/LICENSE / COPY --from=builder /plugin/quorum-hashicorp-vault-plugin /vault/plugins/quorum-hashicorp-vault-plugin -COPY --from=builder /plugin/scripts/vault-init.sh /usr/local/bin/vault-init.sh -COPY --from=builder /plugin/scripts/vault-init-dev.sh /usr/local/bin/vault-init-dev.sh +COPY --from=builder /plugin/scripts/* /usr/local/bin/ EXPOSE 8200 diff --git a/docker-compose.yml b/docker-compose.yml index a8a6142..0cf8e0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,7 +110,7 @@ services: ( sleep 2 ; init.sh && cat > $${VAULT_IS_READY}) & vault server -config=/vault/config.hcl healthcheck: - test: [ "CMD", "wget", "--spider", "--proxy", "off", "http://localhost:8200/v1/sys/health?standbyok=true" ] + test: [ "CMD", "wget", "--spider", "--proxy", "off", "https://localhost:8200/v1/sys/health?standbyok=true" ] interval: 10s timeout: 3s retries: 10