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

Patch from PR 1722 no longer applies to pkg/packagekit/package.go #1

Open
maxgio92 opened this issue Nov 13, 2024 · 2 comments
Open

Comments

@maxgio92
Copy link
Contributor

maxgio92 commented Nov 13, 2024

Hi,
I've just noticed that the patch to pkg/packagekit/package.go launcer's file no longer applies as the PR probably needs a rebase on top of main branch because it misses the VersionNum option field in the PackageOption structure.

Instead, I think this should work:

diff --git a/pkg/packagekit/package.go b/pkg/packagekit/package.go
index bd88b6d..f3f821d 100644
--- a/pkg/packagekit/package.go
+++ b/pkg/packagekit/package.go
@@ -3,14 +3,15 @@ package packagekit
 // PackageOptions is the superset of all packaging options. Not all
 // packages will support all options.
 type PackageOptions struct {
-	Identifier string // What is the identifier? (eg: kolide-app)
-	Name       string // What's the name for this package (eg: launcher)
-	Title      string // MacOS app bundle only -- the title displayed during installation
-	Root       string // source directory to package
-	Scripts    string // directory of packaging scripts (postinst, prerm, etc)
-	Version    string // package version
-	VersionNum int    // package version in numeric format. used to create comparable windows registry keys
-	FlagFile   string // Path to the flagfile for configuration
+	Identifier    string // What is the identifier? (eg: kolide-app)
+	Name          string // What's the name for this package (eg: launcher)
+	Title         string // MacOS app bundle only -- the title displayed during installation
+	Root          string // source directory to package
+	Scripts       string // directory of packaging scripts (postinst, prerm, etc)
+	Version       string // package version
+	VersionNum    int    // package version in numeric format. used to create comparable windows registry keys
+	FlagFile      string // Path to the flagfile for configuration
+	ContainerTool string // Name of container orchestration system to use (docker, podman)
 
 	DisableService bool // Whether to install a system service in a disabled state
@maxgio92
Copy link
Contributor Author

Hi @tstromberg,
I think that the PR 1722 on the Launcher just needs to be rebased on top of the main branch and we should be set :)
Thank you

@maxgio92
Copy link
Contributor Author

In the meantime, as short-term solution or even only document it, I opened a draft here: #3

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

No branches or pull requests

1 participant