mirror of
https://github.com/kairos-io/kcrypt.git
synced 2025-04-27 03:11:16 +00:00
Minor fixups
This commit is contained in:
parent
b05d3c1e54
commit
06a8eff25f
@ -2,7 +2,7 @@ VERSION 0.6
|
|||||||
# Note the base image needs to have dracut.
|
# Note the base image needs to have dracut.
|
||||||
# TODO: This needs to come from pre-built kernels in c3os repos, kcrypt included.
|
# TODO: This needs to come from pre-built kernels in c3os repos, kcrypt included.
|
||||||
# Framework images should use our initrd
|
# Framework images should use our initrd
|
||||||
ARG BASE_IMAGE=quay.io/c3os/core-opensuse
|
ARG BASE_IMAGE=quay.io/kairos/core-opensuse
|
||||||
|
|
||||||
build-kcrypt:
|
build-kcrypt:
|
||||||
FROM golang:alpine
|
FROM golang:alpine
|
||||||
@ -48,15 +48,14 @@ dummy-discovery:
|
|||||||
|
|
||||||
iso:
|
iso:
|
||||||
ARG ISO_NAME=test
|
ARG ISO_NAME=test
|
||||||
ARG IMAGE
|
FROM quay.io/kairos/osbuilder-tools
|
||||||
FROM quay.io/c3os/osbuilder-tools
|
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
RUN zypper in -y jq docker wget
|
RUN zypper in -y jq docker wget
|
||||||
RUN mkdir -p files-iso/boot/grub2
|
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
|
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)
|
WITH DOCKER --allow-privileged --load $IMG=(+image)
|
||||||
RUN /entrypoint.sh --name $ISO_NAME --debug build-iso --date=false --local --overlay-iso /build/files-iso $IMAGE --output /build/
|
RUN /entrypoint.sh --name $ISO_NAME --debug build-iso --date=false --local --overlay-iso /build/files-iso dracut:latest --output /build/
|
||||||
END
|
END
|
||||||
# See: https://github.com/rancher/elemental-cli/issues/228
|
# See: https://github.com/rancher/elemental-cli/issues/228
|
||||||
RUN sha256sum $ISO_NAME.iso > $ISO_NAME.iso.sha256
|
RUN sha256sum $ISO_NAME.iso > $ISO_NAME.iso.sha256
|
||||||
|
@ -6,7 +6,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/jaypipes/ghw/pkg/block"
|
"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"
|
"github.com/mudler/go-pluggable"
|
||||||
)
|
)
|
||||||
|
2
go.mod
2
go.mod
@ -1,4 +1,4 @@
|
|||||||
module github.com/keirros-io/kcrypt
|
module github.com/kairos-io/kcrypt
|
||||||
|
|
||||||
go 1.18
|
go 1.18
|
||||||
|
|
||||||
|
2
main.go
2
main.go
@ -14,7 +14,7 @@ import (
|
|||||||
multierror "github.com/hashicorp/go-multierror"
|
multierror "github.com/hashicorp/go-multierror"
|
||||||
"github.com/jaypipes/ghw"
|
"github.com/jaypipes/ghw"
|
||||||
"github.com/jaypipes/ghw/pkg/block"
|
"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"
|
"github.com/mudler/go-pluggable"
|
||||||
cp "github.com/otiai10/copy"
|
cp "github.com/otiai10/copy"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
|
Loading…
Reference in New Issue
Block a user