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

feat: rename Vault to OpenBao in build files #45

Merged
merged 8 commits into from
Feb 7, 2024

Conversation

kvendingoldo
Copy link
Contributor

No description provided.

@kvendingoldo kvendingoldo changed the title feat: rename Vault to OpenBao feat: rename Vault to OpenBao in build files Jan 13, 2024
Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
.gitignore Show resolved Hide resolved
@Varjoissa
Copy link

Varjoissa commented Jan 17, 2024

The files still have their Hashicorp copyright blocks.

Copyright (c) HashiCorp, Inc.

SPDX-License-Identifier: MPL-2.0

I guess this also has to transform along with the filecontents.

@cipherboy
Copy link
Member

@Varjoissa HashiCorp still largely retains copyright of the original files, so this is expected.

@Varjoissa
Copy link

@Varjoissa HashiCorp still largely retains copyright of the original files, so this is expected.

I understand what you mean and I agree to some extend.
All original file-content is created by Hashicorp and is copyrighted as such.
But as the file-contents changes, Hashicorp doesn't own those changes nor is responsible for them.

Since im not a guy who has experience with these legal matters, maybe this should be looked into.
We might prevent this discussion from happening more then this once :)

@kvendingoldo
Copy link
Contributor Author

@Varjoissa I suggest to change a license header in a separate PR, after discussion. WDYT?

@kvendingoldo
Copy link
Contributor Author

@Varjoissa I've fixed your comment

Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
@kvendingoldo
Copy link
Contributor Author

thread about license header is here: https://github.com/orgs/openbao/discussions/48

@joewxboy
Copy link
Contributor

And for the record, for anyone reading this file in the future, we must ensure that we do NOT remove any legally-required attribution from these files. This would include any existing copyright notices. Those should not be removed or modified in any way, except possibly to fix the format of the SPDX header if there was a format error and as long as it does not change the contents in any way. But IANAL.

Copy link
Member

@cipherboy cipherboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nits :-) Thank you for this, @kvendingoldo!

.gitignore Show resolved Hide resolved
#
# For production derivatives of this container, you shoud add the IPC_LOCK
# capability so that Vault can mlock memory.
# capability so that OpenBao can mlock memory.
COPY .release/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
ENTRYPOINT ["docker-entrypoint.sh"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT, docker-entrypoint.sh isn't modified in this PR, so I don't think this will work. Are you interested in doing that? :-)

scripts/build.sh Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Copy link
Member

@cipherboy cipherboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last nit (sorry!) but then I think it looks good to me! Thank you @kvendingoldo!

scripts/docker/Dockerfile Outdated Show resolved Hide resolved
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
Copy link
Member

@cipherboy cipherboy Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, we've moved into the openbao/openbao namespace, so this breaks:

$ make docker-dev
... output elided ...
[1/2] STEP 4/6: WORKDIR /go/src/github.com/openbao/openbao
... more output elided ...
==> Results:
total 128M
-rwxr-xr-x. 1 root root 128M Jan 29 15:07 bao
--> 81f44a0917fc
[2/2] STEP 1/11: FROM alpine:3.13
[2/2] STEP 2/11: RUN addgroup bao &&     adduser -S -G bao bao
--> 1c3994831238
[2/2] STEP 3/11: RUN set -eux;     apk add --no-cache ca-certificates libcap su-exec dumb-init tzdata
+ apk add --no-cache ca-certificates libcap su-exec dumb-init tzdata
fetch https://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz
fetch https://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz
(1/5) Installing ca-certificates (20220614-r0)
(2/5) Installing dumb-init (1.2.5-r0)
(3/5) Installing libcap (2.46-r0)
(4/5) Installing su-exec (0.2-r1)
(5/5) Installing tzdata (2022f-r1)
Executing busybox-1.32.1-r9.trigger
Executing ca-certificates-20220614-r0.trigger
OK: 10 MiB in 19 packages
--> 2c9187cd7694
[2/2] STEP 4/11: COPY --from=builder /go/src/github.com/lf-edge/openbao/bin/bao /bin/bao
Error: building at STEP "COPY --from=builder /go/src/github.com/lf-edge/openbao/bin/bao /bin/bao": checking on sources under "/home/cipherboy/.local/share/containers/storage/overlay/7f7e7b301e82675b2bd2ea6b9dc496383f963b59484cca6cc5fac38b6c4018d6/merged": copier: stat: "/go/src/github.com/lf-edge/openbao/bin/bao": no such file or directory
make: *** [Makefile:61: docker-dev] Error 125

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kvendingoldo I'm happy to pick this one up for you, but I'd appreciate it if you could do the DCO that @naphelps mentioned so we can get this merged without it. :-)

@naphelps
Copy link
Member

naphelps commented Feb 5, 2024

@kvendingoldo Your commits need sign-offs using the --signoff flag and gpg signed to merge this pull request.

@kvendingoldo kvendingoldo linked an issue Feb 5, 2024 that may be closed by this pull request
@naphelps naphelps self-requested a review February 5, 2024 14:21
@kvendingoldo
Copy link
Contributor Author

ok, will fix it today

Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
Signed-off-by: Alexander Sharov <kvendingoldo@yandex.ru>
@naphelps naphelps merged commit 3d61d5f into openbao:main Feb 7, 2024
3 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fork Hashicorp Vault
5 participants