From 5d43f435f627e6feeafdf7dbfd755d5a065341d9 Mon Sep 17 00:00:00 2001
From: root <root@builder.metal.dreamworx.nl>
Date: Wed, 7 Aug 2024 12:44:35 +0000
Subject: [PATCH] Clean out old content

---
 build.sh                                      | 53 --------------
 images/Dockerfile                             | 73 -------------------
 overlay/files-iso/boot/grub2/grub.cfg         | 41 -----------
 overlay/files-iso/config.yaml                 |  9 ---
 .../opt/spectrocloud/content/Readme.txt       |  1 -
 overlay/files/Readme.txt                      |  1 -
 6 files changed, 178 deletions(-)
 delete mode 100755 build.sh
 delete mode 100644 images/Dockerfile
 delete mode 100644 overlay/files-iso/boot/grub2/grub.cfg
 delete mode 100644 overlay/files-iso/config.yaml
 delete mode 100644 overlay/files-iso/opt/spectrocloud/content/Readme.txt
 delete mode 100644 overlay/files/Readme.txt

diff --git a/build.sh b/build.sh
deleted file mode 100755
index 8e900bb..0000000
--- a/build.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash -x
-
-set -xe
-source .versions.env
-CANVOS_ENV=prod
-ISO_IMAGE_NAME=$CANVOS_ENV-installer
-IMAGE_REPOSITORY="${IMAGE_REPOSITORY:-3pings}"
-INSTALLER_IMAGE=${IMAGE_REPOSITORY}/${ISO_IMAGE_NAME}:${SPECTRO_VERSION}
-ISO_IMAGE_ID=palette.io/${ISO_IMAGE_NAME}:${SPECTRO_VERSION}
-BUILD_PLATFORM="${BUILD_PLATFORM:-linux/amd64}"
-K8S_PROVIDER_VERSION=v1.2.3
-KAIROS_VERSION="${KAIROS_VERSION:-v1.5.0}"
-BASE_IMAGE=quay.io/kairos/core-ubuntu-22-lts:"${KAIROS_VERSION}"
-
-docker system prune -af
-
-echo "Building Installer image $INSTALLER_IMAGE from $BASE_IMAGE"
-docker build --build-arg BASE_IMAGE=$BASE_IMAGE \
-              --build-arg SPECTRO_VERSION=$SPECTRO_VERSION \
-              --build-arg SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION \
-               -t $INSTALLER_IMAGE -f images/Dockerfile .
-
-for k8s_version in ${K8S_VERSIONS//,/ }
-do
-    IMAGE=${IMAGE_REPOSITORY}/core-ubuntu-22-lts-k3s:$CANVOS_ENV-v${k8s_version}_${K8S_PROVIDER_VERSION}
-    docker build --build-arg K8S_VERSION=$k8s_version \
-                 --build-arg BASE_IMAGE=$BASE_IMAGE \
-                 --build-arg SPECTRO_VERSION=$SPECTRO_VERSION \
-                 --build-arg SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION \
-                 -t $IMAGE \
-                 -f images/Dockerfile ./
-    if [[ "$PUSH_BUILD" == "true" ]]; then
-      echo "Pushing image"
-      docker push "$IMAGE"
-    fi
-done
-
-docker rmi $ISO_IMAGE_ID || true
-docker tag $INSTALLER_IMAGE $ISO_IMAGE_ID
-echo "Building $ISO_IMAGE_NAME.iso from $INSTALLER_IMAGE"
-docker run -v $PWD:/cOS \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-             -i --rm quay.io/kairos/osbuilder-tools:v0.3.3 --name $ISO_IMAGE_NAME \
-             --debug build-iso --date=false $ISO_IMAGE_ID --local --overlay-iso /cOS/overlay/files-iso  --output /cOS/
-docker rmi $ISO_IMAGE_ID
-
-# if [[ "$PUSH_BUILD" == "true" ]]; then
-#   echo "Pushing image"
-#   docker push "$INSTALLER_IMAGE"
-# fi
-
-aws s3 cp $ISO_IMAGE_NAME.iso s3://edgeforge/images/$ISO_IMAGE_NAME-$SPECTRO_VERSION.iso --profile gh-runner
-rm $ISO_IMAGE_NAME.iso
\ No newline at end of file
diff --git a/images/Dockerfile b/images/Dockerfile
deleted file mode 100644
index cf0e062..0000000
--- a/images/Dockerfile
+++ /dev/null
@@ -1,73 +0,0 @@
-############################Do not edit below this line##################################
-ARG BASE_IMAGE_TAG=v1.5.0
-ARG BASE_IMAGE=quay.io/kairos/core-ubuntu-22-lts:${BASE_IMAGE_TAG}
-ARG IMAGE_REPOSITORY=registry.hub.docker.com/3pings/ubuntu-k3s
-ARG SPECTRO_VERSION=v3.3.3
-ARG SPECTRO_LUET_VERSION=v1.0.3
-FROM gcr.io/spectro-dev-public/stylus-framework:${SPECTRO_VERSION} as spectro-base
-FROM ghcr.io/kairos-io/provider-k3s:v1.2.3  as provider-k3s
-
-FROM $BASE_IMAGE
-ARG BASE_IMAGE_TAG
-ARG IMAGE_REPOSITORY
-ARG BASE_IMAGE_NAME=core-ubuntu-22-lts
-ARG BASE_IMAGE
-ARG SPECTRO_VERSION
-ARG K8S_VERSION=1.25.2-k3s1
-
-ARG ARCH=amd64
-ENV ARCH=${ARCH}
-COPY --from=spectro-base / /
-COPY --from=provider-k3s / /
-
-RUN mkdir -p /etc/luet/repos.conf.d && \
-    luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo  --priority 1 -y && \
-    luet repo add kairos  --type docker --url quay.io/kairos/packages -y && \
-    luet repo update
-
-
-RUN luet install -y  k8s/k3s@$K8S_VERSION && luet cleanup
-RUN luet install -y system/elemental-cli && luet cleanup
-
-
-# ENV OS_NAME=$OS_ID:${SPECTRO_VERSION}
-# ENV OS_REPO=${IMAGE_REPOSITORY}
-# ENV OS_LABEL=${BASE_IMAGE_TAG}_${K8S_VERSION}_${SPECTRO_VERSION}
-# RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
-
-ENV OS_ID=ubuntu
-ENV OS_VERSION=22.04
-ENV OS_NAME=${BASE_IMAGE_NAME}-k3s:${SPECTRO_VERSION}
-ENV OS_REPO=${IMAGE_REPOSITORY}
-ENV OS_LABEL=${BASE_IMAGE_TAG}_${K8S_VERSION}_${SPECTRO_VERSION}
-RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
-
-RUN apt-get update && apt-get install zstd -y
-   
-    
-## Copy any custom files by placing in the directory specified below
-COPY overlay/files/ /
-   
-RUN apt-get update && apt-get upgrade -y
-RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && \
-            ln -sf "${kernel#/boot/}" /boot/vmlinuz
-RUN kernel=$(ls /lib/modules | head -n1) && \
-            dracut -f "/boot/initrd-${kernel}" "${kernel}" && \
-            ln -sf "initrd-${kernel}" /boot/initrd
-RUN kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
-RUN apt-get clean
-   
-    
-############################Do not edit above this line##################################
-###########################Add any other image customizations here #######################
-
-#Examples
-# To install the nginx package from ubuntu or opensuse repos
-#RUN zypper refresh && zypper install nginx
-# or
-#RUN apt-get update && apt-get install nginx
-
-##########################################################################################
-RUN rm -f /etc/ssh/ssh_host_* /etc/ssh/moduli
-# Clear cache
-RUN rm -rf /var/cache/* && apt-get clean && rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm -rf /var/lib/dbus/machine-id && rm -rf /etc/hostname
\ No newline at end of file
diff --git a/overlay/files-iso/boot/grub2/grub.cfg b/overlay/files-iso/boot/grub2/grub.cfg
deleted file mode 100644
index 5ad77af..0000000
--- a/overlay/files-iso/boot/grub2/grub.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-search --file --set=root /boot/kernel.xz
-set default=0
-set timeout=5
-set timeout_style=menu
-set linux=linux
-set initrd=initrd
-if [ "${grub_cpu}" = "x86_64" -o "${grub_cpu}" = "i386" -o "${grub_cpu}" = "arm64" ];then
-    if [ "${grub_platform}" = "efi" ]; then
-        if [ "${grub_cpu}" != "arm64" ]; then
-            set linux=linuxefi
-            set initrd=initrdefi
-        fi
-    fi
-fi
-if [ "${grub_platform}" = "efi" ]; then
-    echo "Please press 't' to show the boot menu on this console"
-fi
-set font=($root)/boot/${grub_cpu}/loader/grub2/fonts/unicode.pf2
-if [ -f ${font} ];then
-    loadfont ${font}
-fi
-menuentry "Palette eXtended Kubernetes Edge Installer" --class os --unrestricted {
-    echo Loading kernel...
-    $linux ($root)/boot/kernel cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs net.ifnames=1 console=tty1  rd.cos.disable vga=795 nomodeset nodepair.enable selinux=0
-    echo Loading initrd...
-    $initrd ($root)/boot/initrd
-}
-
-menuentry "Palette eXtended Kubernetes Edge Installer (manual)" --class os --unrestricted {
-    echo Loading kernel...
-    $linux ($root)/boot/kernel cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs net.ifnames=1 console=tty1  rd.cos.disable selinux=0
-    echo Loading initrd...
-    $initrd ($root)/boot/initrd
-}
-
-if [ "${grub_platform}" = "efi" ]; then
-    hiddenentry "Text mode" --hotkey "t" {
-        set textmode=true
-        terminal_output console
-    }
-fi
diff --git a/overlay/files-iso/config.yaml b/overlay/files-iso/config.yaml
deleted file mode 100644
index 15a322b..0000000
--- a/overlay/files-iso/config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-install:
-  poweroff: true
-stages:
-  initramfs:
-    - users:
-        kairos:
-          groups:
-            - sudo
-          passwd: kairos
diff --git a/overlay/files-iso/opt/spectrocloud/content/Readme.txt b/overlay/files-iso/opt/spectrocloud/content/Readme.txt
deleted file mode 100644
index 153b0c2..0000000
--- a/overlay/files-iso/opt/spectrocloud/content/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Added spectro generated content in this directory
\ No newline at end of file
diff --git a/overlay/files/Readme.txt b/overlay/files/Readme.txt
deleted file mode 100644
index 65a31f9..0000000
--- a/overlay/files/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-An example overlay file which will be copied to the root file system at /
\ No newline at end of file