Skip to content

Commit

Permalink
rename vault to bao
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Sharov <[email protected]>
  • Loading branch information
kvendingoldo authored and naphelps committed Feb 7, 2024
1 parent 886c1d7 commit 98d58ee
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ test-ember-enos: install-ui-dependencies
@cd ui && yarn run test:enos

check-openbao-in-path:
@OPENBAO_BIN=$$(command -v openbao) || { echo "openbao command not found"; exit 1; }; \
@OPENBAO_BIN=$$(command -v bao) || { echo "bao command not found"; exit 1; }; \
[ -x "$$OPENBAO_BIN" ] || { echo "$$OPENBAO_BIN not executable"; exit 1; }; \
printf "Using OpenBao at %s:\n\$$ openbao version\n%s\n" "$$OPENBAO_BIN" "$$(openbao version)"
printf "Using OpenBao at %s:\n\$$ openbao version\n%s\n" "$$OPENBAO_BIN" "$$(bao version)"

ember-dist: install-ui-dependencies
@cd ui && npm rebuild node-sass
Expand Down
36 changes: 18 additions & 18 deletions scripts/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM golang:${VERSION} AS builder
ARG CGO_ENABLED=0
ARG BUILD_TAGS

WORKDIR /go/src/github.com/hashicorp/vault
WORKDIR /go/src/github.com/openbao/openbao
COPY . .

RUN make bootstrap \
Expand All @@ -20,44 +20,44 @@ RUN make bootstrap \

FROM alpine:3.13

# Create a vault user and group first so the IDs get set the same way,
# Create a bao user and group first so the IDs get set the same way,
# even as the rest of this may change over time.
RUN addgroup vault && \
adduser -S -G vault vault
RUN addgroup bao && \
adduser -S -G bao bao

# Set up certificates, our base tools, and Vault.
# Set up certificates, our base tools, and OpenBao.
RUN set -eux; \
apk add --no-cache ca-certificates libcap su-exec dumb-init tzdata

COPY --from=builder /go/src/github.com/lf-edge/openbao/bin/vault /bin/vault
COPY --from=builder /go/src/github.com/lf-edge/openbao/bin/bao /bin/bao

# /vault/logs is made available to use as a location to store audit logs, if
# desired; /vault/file is made available to use as a location with the file
# storage backend, if desired; the server will be started with /vault/config as
# /bao/logs is made available to use as a location to store audit logs, if
# desired; /bao/file is made available to use as a location with the file
# storage bao, if desired; the server will be started with /bao/config as
# the configuration directory so you can add additional config files in that
# location.
RUN mkdir -p /vault/logs && \
mkdir -p /vault/file && \
mkdir -p /vault/config && \
chown -R vault:vault /vault
RUN mkdir -p /bao/logs && \
mkdir -p /bao/file && \
mkdir -p /bao/config && \
chown -R bao:bao /bao

# Expose the logs directory as a volume since there's potentially long-running
# state in there
VOLUME /vault/logs
VOLUME /bao/logs

# Expose the file directory as a volume since there's potentially long-running
# state in there
VOLUME /vault/file
VOLUME /bao/file

# 8200/tcp is the primary interface that applications use to interact with
# Vault.
# OpenBao.
EXPOSE 8200

# The entry point script uses dumb-init as the top-level process to reap any
# zombie processes created by Vault sub-processes.
# zombie processes created by OpenBao sub-processes.
#
# For production derivatives of this container, you should add the IPC_LOCK
# capability so that Vault can mlock memory.
# capability so that OpenBao can mlock memory.
COPY ./scripts/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
ENTRYPOINT ["docker-entrypoint.sh"]

Expand Down

0 comments on commit 98d58ee

Please sign in to comment.