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 /etc/os-release