diff --git a/packages/dracut-config/build.yaml b/packages/dracut-config/build.yaml deleted file mode 100644 index 553dba1..0000000 --- a/packages/dracut-config/build.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: "alpine" - -steps: -- mkdir -p /output/etc/dracut.conf.d/ -- cp -rf dracut.conf /output/etc/dracut.conf.d/20-kairos.conf -package_dir: "/output" \ No newline at end of file diff --git a/packages/dracut-config/definition.yaml b/packages/dracut-config/definition.yaml deleted file mode 100644 index bf6445b..0000000 --- a/packages/dracut-config/definition.yaml +++ /dev/null @@ -1,3 +0,0 @@ -category: "config" -name: "dracut" -version: "0.2" \ No newline at end of file diff --git a/packages/initrd/build.yaml b/packages/initrd/build.yaml index 45df61b..a11086e 100644 --- a/packages/initrd/build.yaml +++ b/packages/initrd/build.yaml @@ -11,12 +11,6 @@ copy: version: ">=0" source: "/framework/." destination: "/" -- package: - category: "config" - name: "dracut" - version: ">=0" - source: "/output/." - destination: "/" - package: category: "system" name: "elemental-cli" diff --git a/packages/toolkit/build.yaml b/packages/toolkit/build.yaml index 156b58d..41f5ebe 100644 --- a/packages/toolkit/build.yaml +++ b/packages/toolkit/build.yaml @@ -8,7 +8,7 @@ copy: prelude: - | mkdir -p /etc/luet/repos.conf.d && \ - luet repo add --type docker --reference "v{{.Values.version}}-repository.yaml" --yes --url {{.Values.repo}} elemental + luet repo add --type docker --reference "v{{.Values.tag}}-repository.yaml" --yes --url {{.Values.repo}} elemental package_dir: /framework steps: - | @@ -20,6 +20,8 @@ steps: cloud-config/boot-assessment \ cloud-config/rootfs \ system-openrc/cos-setup +#- mkdir -p /output/etc/dracut.conf.d/ +- cp -rf dracut.conf /output/etc/dracut.conf.d/20-kairos.conf excludes: - var/cache|var/cache/.* - usr/bin/elemental \ No newline at end of file diff --git a/packages/toolkit/collection.yaml b/packages/toolkit/collection.yaml index 5000dba..d3cde29 100644 --- a/packages/toolkit/collection.yaml +++ b/packages/toolkit/collection.yaml @@ -2,7 +2,8 @@ packages: - name: "elemental-toolkit-opensuse" category: "system" repo: "quay.io/costoolkit/releases-teal" - version: "0.8.14-22" + version: "0.8.14-23" + tag: "0.8.14-22" license: "Apache License 2.0" copyright: SUSE labels: @@ -11,7 +12,8 @@ packages: - name: "elemental-toolkit-ubuntu" repo: "quay.io/costoolkit/releases-orange" category: "system" - version: "0.8.14-22" + version: "0.8.14-23" + tag: "0.8.14-22" license: "Apache License 2.0" copyright: SUSE labels: @@ -20,7 +22,8 @@ packages: - name: "elemental-toolkit-fedora" repo: "quay.io/costoolkit/releases-blue" category: "system" - version: "0.8.14-22" + version: "0.8.14-23" + tag: "0.8.14-22" license: "Apache License 2.0" copyright: SUSE labels: diff --git a/packages/dracut-config/dracut.conf b/packages/toolkit/dracut.conf similarity index 100% rename from packages/dracut-config/dracut.conf rename to packages/toolkit/dracut.conf