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.

Sign up for GitHub

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

Jump to bottom

fix: add missing content to deb and rpm packages #320

Merged
merged 2 commits into from
May 10, 2023
Merged

fix: add missing content to deb and rpm packages #320

merged 2 commits into from
May 10, 2023

Conversation

bjorand
Copy link
Contributor

@bjorand bjorand commented May 2, 2023 •
edited

Since 1.6.7 and the switch to nfpms, deb package contains only the binary, we are missing all other content in the package:

$ dpkg -L gokeyless
/usr
/usr/local
/usr/local/bin
/usr/local/bin/gokeyless
$ /usr/local/bin/gokeyless -v
gokeyless version 1.6.7

vs for 1.6.6:

$ dpkg -L gokeyless
/.
/etc
/etc/keyless
/etc/keyless/keyless_cacert.pem
/etc/keyless/keys
/etc/keyless/gokeyless.yaml
/etc/init.d
/etc/init.d/gokeyless
/usr
/usr/local
/usr/local/bin
/usr/local/bin/gokeyless
/usr/share
/usr/share/doc
/usr/share/doc/gokeyless
/usr/share/doc/gokeyless/changelog.gz
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/gokeyless.service
$ gokeyless -v
gokeyless version 1.6.6

I've tested locally to build the deb with goreleaser+nfpms successfully.

nickysemenza
nickysemenza approved these changes May 3, 2023
View reviewed changes
.goreleaser.yml
@@ -50,3 +50,34 @@ nfpms:
formats:
- deb
- rpm
overrides:
deb:
Copy link
Member

Choose a reason for hiding this comment

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

LGTM thanks, https://github.com/cloudflare/gokeyless/blob/master/Makefile#L58-L82 seems to roughly match the behavior this this command (what was previously used to use packages) does

Copy link
Member

Choose a reason for hiding this comment

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

will have @mitalirawat double check

Copy link
Contributor

Choose a reason for hiding this comment

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

lgtm. We should probably remove this file now but still discussing.

- src: pkg/gokeyless.sysv
        dst: /etc/init.d/gokeyless

@nickysemenza nickysemenza requested a review from a team May 3, 2023 17:44
@nickysemenza nickysemenza merged commit 3f52f51 into cloudflare:master May 10, 2023
4 checks passed
@nickysemenza nickysemenza added this to the may2023 improvements milestone May 11, 2023
@nickysemenza nickysemenza mentioned this pull request May 11, 2023
Closed
nickysemenza added a commit that referenced this pull request May 15, 2023
@nickysemenza
update services to expect binary in usr/bin
238c49e 
This seems to be more correct than user/local/bin, and goreleaser's defaults corroborate that.

Resolves #328, as this behavior is the systemd default
Adds on to #320 as well.
@nickysemenza nickysemenza mentioned this pull request May 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickysemenza nickysemenza nickysemenza approved these changes

@mitalirawat mitalirawat mitalirawat approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
May 2023 improvements
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bjorand @nickysemenza @mitalirawat