rancher/kcrypt
1
0
Fork 0
mirror of https://github.com/kairos-io/kcrypt.git synced 2025-09-02 15:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from kairos-io/fix-version-bug-and-typpos

Browse Source 
Fix typo in name, bad function call and version of the binary
This commit is contained in:
Dimitris Karakasilis
2022-11-15 15:13:05 +02:00
committed by GitHub
parent 44ccb84dfb b9572125e1
commit 7310c313ee
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Earthfile
View File

@@ -6,9 +6,11 @@ ARG BASE_IMAGE=quay.io/kairos/core-opensuse
build-kcrypt: build-kcrypt:
FROM golang:alpine FROM golang:alpine
RUN apk add git
COPY . /work COPY . /work
WORKDIR /work WORKDIR /work
RUN CGO_ENABLED=0 go build -o kcrypt ARG VERSION="$(git describe --tags)"
RUN CGO_ENABLED=0 go build -o kcrypt -ldflags "-X main.Version=$VERSION"
SAVE ARTIFACT /work/kcrypt AS LOCAL kcrypt SAVE ARTIFACT /work/kcrypt AS LOCAL kcrypt
build-dracut: build-dracut:

10
main.go
View File

@@ -21,6 +21,8 @@ import (
pi "github.com/kairos-io/kcrypt/pkg/partition_info" pi "github.com/kairos-io/kcrypt/pkg/partition_info"
) )
var Version = "v0.0.0-dev"
func waitdevice(device string, attempts int) error { func waitdevice(device string, attempts int) error {
for tries := 0; tries < attempts; tries++ { for tries := 0; tries < attempts; tries++ {
sh("udevadm settle") sh("udevadm settle")
@@ -279,7 +281,7 @@ func injectInitrd(initrd string, file, dst string) error {
func unlockAll() error { func unlockAll() error {
bus.Manager.Initialize() bus.Manager.Initialize()
partitionInfo, err := pi.NewPartitionInfoFromFile(pi.DefaultPartitionInfoFile) partitionInfo, _, err := pi.NewPartitionInfoFromFile(pi.DefaultPartitionInfoFile)
if err != nil { if err != nil {
return err return err
} }
@@ -305,10 +307,10 @@ func unlockAll() error {
func main() { func main() {
app := &cli.App{ app := &cli.App{
Name: "keiros-kcrypt", Name: "kairos-kcrypt",
Version: "0.1", Version: Version,
Author: "Ettore Di Giacinto", Author: "Ettore Di Giacinto",
Usage: "keiros escrow key agent component", Usage: "kairos escrow key agent component",
Description: ``, Description: ``,
UsageText: ``, UsageText: ``,
Copyright: "Ettore Di Giacinto", Copyright: "Ettore Di Giacinto",