Skip to content

Commit

Permalink
Merge pull request #3 from be-ys-cloud/v1_17_3
Browse files Browse the repository at this point in the history
Added v1.17.3
  • Loading branch information
florian-forestier authored Aug 22, 2024
2 parents a87ef46 + 75f4ad1 commit 9ec79d1
Show file tree
Hide file tree
Showing 4 changed files with 1,550 additions and 3 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,23 @@ Project which takes [HashiCorp Vault](https://github.com/hashicorp/vault/) sourc
* For convenience, you will also find a ready-to-go docker file in `docker/` folder. You can build the project
using `docker build -t customized_vault:latest -f docker/Dockerfile .`

### Run it

**This command is only designed to test your Vault build. DO NOT use this configuration on production!**

`docker run --rm -p 8200:8200 -e VAULT_API_ADDR="http://localhost" --cap-add=IPC_LOCK customized_vault:latest`

### How to make a new patch ?

While updating Vault to a new version, we strongly suggest you to start by copying the previous version folder patches
and use it as a base.

Vault APIs are quite stable, so you (theoretically) will not spend a lot of times on migration.

To patch and ignore errors, you can run `git apply --reject --whitespace=fix ../patches/<DESIRED_VERSION>.patch`. Then
fix all files that were rejected. Run a `git add . && git commit -m "new version"` in `vault` directory, then
a `git diff HEAD~1 > ../patches/v<DESIRED_VERSION>.patch` to save the full diff.

_____________

## Using the connector (as an administrator)
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-bullseye as build
FROM golang:1.22-bullseye AS build

RUN mkdir /builddir
WORKDIR /builddir
Expand All @@ -12,7 +12,7 @@ RUN go get github.com/dmarkham/enumer
RUN go install github.com/dmarkham/enumer
RUN make bootstrap static-dist bin

FROM alpine:3.20 as run
FROM alpine:3.20 AS run
COPY --from=build /builddir/bin/vault /opt/vault
COPY docker/configuration.json /opt/configuration.json
EXPOSE 8200
Expand Down
1 change: 0 additions & 1 deletion docker/configuration.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"log-file": "/opt/data/",
"storage": {
"file": {
"path": "/opt/data/file"
Expand Down
Loading

0 comments on commit 9ec79d1

Please sign in to comment.