Skip to content

add stacker version as annotation to images #602

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

Merged
merged 1 commit into from
Mar 20, 2024
Merged

add stacker version as annotation to images #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ BUILD_TAGS = exclude_graphdriver_btrfs exclude_graphdriver_devicemapper containe

STACKER_OPTS=--oci-dir=$(BUILD_D)/oci --roots-dir=$(BUILD_D)/roots --stacker-dir=$(BUILD_D)/stacker --storage-type=overlay

build_stacker = go build $1 -tags "$(BUILD_TAGS) $2" -ldflags "-X main.version=$(VERSION_FULL) -X main.lxc_version=$(LXC_VERSION) $3" -o $4 ./cmd/stacker
VERSION_LDFLAGS=-X stackerbuild.io/stacker/pkg/lib.StackerVersion=$(VERSION_FULL) -X stackerbuild.io/stacker/pkg/lib.LXCVersion=$(LXC_VERSION)
build_stacker = go build $1 -tags "$(BUILD_TAGS) $2" -ldflags "$(VERSION_LDFLAGS) $3" -o $4 ./cmd/stacker

# See doc/hacking.md for how to use a local oci or docker repository.
STACKER_DOCKER_BASE?=docker://ghcr.io/project-stacker/
Expand Down
9 changes: 4 additions & 5 deletions cmd/stacker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ import (
"golang.org/x/term"
"gopkg.in/yaml.v2"
"stackerbuild.io/stacker/pkg/container"
"stackerbuild.io/stacker/pkg/lib"
stackerlog "stackerbuild.io/stacker/pkg/log"
"stackerbuild.io/stacker/pkg/types"
)

var (
config types.StackerConfig
version = ""
lxc_version = ""
config types.StackerConfig
)

func shouldShowProgress(ctx *cli.Context) bool {
Expand Down Expand Up @@ -94,7 +93,7 @@ func main() {
app := cli.NewApp()
app.Name = "stacker"
app.Usage = "stacker builds OCI images"
app.Version = fmt.Sprintf("stacker %s liblxc %s", version, lxc_version)
app.Version = fmt.Sprintf("stacker %s liblxc %s", lib.StackerVersion, lib.LXCVersion)

configDir := os.Getenv("XDG_CONFIG_HOME")
if configDir == "" {
Expand Down Expand Up @@ -309,7 +308,7 @@ func main() {
}

stackerlog.FilterNonStackerLogs(handler, logLevel)
stackerlog.Debugf("stacker version %s", version)
stackerlog.Debugf("stacker version %s", lib.StackerVersion)

if !ctx.Bool("internal-userns") && !shouldSkipInternalUserns(ctx) && len(os.Args) > 1 {
binary, err := os.Readlink("/proc/self/exe")
Expand Down
6 changes: 6 additions & 0 deletions pkg/lib/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package lib

var (
StackerVersion = ""
LXCVersion = ""
)
5 changes: 5 additions & 0 deletions pkg/stacker/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "fmt"
const (
GitVersionAnnotation = "%s.stacker.git_version"
StackerContentsAnnotation = "%s.stacker.stacker_yaml"
StackerVersionAnnotation = "%s.stacker.stacker_version"
)

func getGitVersionAnnotation(namespace string) string {
Expand All @@ -14,3 +15,7 @@ func getGitVersionAnnotation(namespace string) string {
func getStackerContentsAnnotation(namespace string) string {
return fmt.Sprintf(StackerContentsAnnotation, namespace)
}

func getStackerVersionAnnotation(namespace string) string {
return fmt.Sprintf(StackerVersionAnnotation, namespace)
}
2 changes: 2 additions & 0 deletions pkg/stacker/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
"stackerbuild.io/stacker/pkg/container"
"stackerbuild.io/stacker/pkg/lib"
"stackerbuild.io/stacker/pkg/log"
"stackerbuild.io/stacker/pkg/test"
"stackerbuild.io/stacker/pkg/types"
Expand Down Expand Up @@ -281,6 +282,7 @@ func (b *Builder) updateOCIConfigForOutput(sf *types.Stackerfile, s types.Storag
}

annotations[getStackerContentsAnnotation(opts.AnnotationsNamespace)] = sf.AfterSubstitutions
annotations[getStackerVersionAnnotation(opts.AnnotationsNamespace)] = lib.StackerVersion

history := ispec.History{
EmptyLayer: true, // this is only the history for imageConfig edit
Expand Down