From 06a8eff25fe38964d9b630a476313839306f79a0 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 4 Oct 2022 17:08:20 +0000 Subject: [PATCH] Minor fixups --- Earthfile | 9 ++++----- examples/dummy-discovery/main.go | 2 +- go.mod | 2 +- main.go | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index c6c8edf..e12b0cc 100644 --- a/Earthfile +++ b/Earthfile @@ -2,7 +2,7 @@ VERSION 0.6 # Note the base image needs to have dracut. # TODO: This needs to come from pre-built kernels in c3os repos, kcrypt included. # Framework images should use our initrd -ARG BASE_IMAGE=quay.io/c3os/core-opensuse +ARG BASE_IMAGE=quay.io/kairos/core-opensuse build-kcrypt: FROM golang:alpine @@ -48,15 +48,14 @@ dummy-discovery: iso: ARG ISO_NAME=test - ARG IMAGE - FROM quay.io/c3os/osbuilder-tools + FROM quay.io/kairos/osbuilder-tools WORKDIR /build RUN zypper in -y jq docker wget RUN mkdir -p files-iso/boot/grub2 RUN wget https://raw.githubusercontent.com/c3os-io/c3os/master/overlay/files-iso/boot/grub2/grub.cfg -O files-iso/boot/grub2/grub.cfg - WITH DOCKER --allow-privileged --load $IMAGE=(+image) - RUN /entrypoint.sh --name $ISO_NAME --debug build-iso --date=false --local --overlay-iso /build/files-iso $IMAGE --output /build/ + WITH DOCKER --allow-privileged --load $IMG=(+image) + RUN /entrypoint.sh --name $ISO_NAME --debug build-iso --date=false --local --overlay-iso /build/files-iso dracut:latest --output /build/ END # See: https://github.com/rancher/elemental-cli/issues/228 RUN sha256sum $ISO_NAME.iso > $ISO_NAME.iso.sha256 diff --git a/examples/dummy-discovery/main.go b/examples/dummy-discovery/main.go index 84fecd9..5aa8410 100644 --- a/examples/dummy-discovery/main.go +++ b/examples/dummy-discovery/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/jaypipes/ghw/pkg/block" - "github.com/keirros-io/kcrypt/pkg/bus" + "github.com/kairos-io/kcrypt/pkg/bus" "github.com/mudler/go-pluggable" ) diff --git a/go.mod b/go.mod index 770cbcd..a1723ff 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/keirros-io/kcrypt +module github.com/kairos-io/kcrypt go 1.18 diff --git a/main.go b/main.go index 1b28a60..aff8467 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/jaypipes/ghw" "github.com/jaypipes/ghw/pkg/block" - "github.com/keirros-io/kcrypt/pkg/bus" + "github.com/kairos-io/kcrypt/pkg/bus" "github.com/mudler/go-pluggable" cp "github.com/otiai10/copy" "github.com/urfave/cli"