Minor fixups

This commit is contained in:
Ettore Di Giacinto 2022-10-04 17:08:20 +00:00
parent b05d3c1e54
commit 06a8eff25f
4 changed files with 7 additions and 8 deletions

View File

@ -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

View File

@ -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"
)

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/keirros-io/kcrypt
module github.com/kairos-io/kcrypt
go 1.18

View File

@ -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"