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 to 1.15.3 #1170

Merged
merged 1 commit into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,6 @@ workflows:
- build:
name: build-vault
container-image: vault
scan: true
- build:
name: build-victoriametrics-operator
container-image: victoriametrics-operator
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ jobs:
- dir: "./unbound"
container-image: "unbound"
scan: "true"
- dir: "./vault"
container-image: "vault"
scan: "true"

runs-on: ubuntu-22.04
env:
Expand Down
2 changes: 1 addition & 1 deletion vault/BRANCH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14
1.15
6 changes: 3 additions & 3 deletions vault/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# vault container

# Stage1: build from source
FROM quay.io/cybozu/golang:1.20-jammy AS build
FROM ghcr.io/cybozu/golang:1.21-jammy AS build

ARG VAULT_VERSION=1.14.3
ARG VAULT_VERSION=1.15.3

RUN git clone --depth=1 -b v${VAULT_VERSION} https://github.com/hashicorp/vault.git

Expand All @@ -14,7 +14,7 @@ RUN make bootstrap && \
make

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

COPY --from=build /work/vault/bin /usr/local/vault/bin
COPY --from=build /work/vault/LICENSE /usr/local/vault/LICENSE
Expand Down
4 changes: 2 additions & 2 deletions vault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ To launch vault server by `docker run`:
--ulimit memlock=-1 \
-v /your/config.hcl:/vault/config/config.hcl:ro \
-p 8200:8200 -p 8201:8201 \
quay.io/cybozu/vault:1.14 \
ghcr.io/cybozu/vault:1.15 \
server -config=/vault/config/config.hcl

To use vault cli, first install it in a host OS directory `DIR`:

$ docker run --rm -u root:root \
--entrypoint /usr/local/vault/install-tools \
-v DIR:/host \
quay.io/cybozu/vault:1.14
ghcr.io/cybozu/vault:1.15

Then run `vault` as follows:

Expand Down
2 changes: 1 addition & 1 deletion vault/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.3.1
1.15.3.1
Loading