Skip to content

Commit 9779b76

Browse files
ubuntu base image docker file with kairos framework v2.4.5 (#152)
* ubuntu base image docker file with kairos framework v2.4.5 * add --no-install-recommends to upgrade * update base image list * update base image path * remove snapd
1 parent fbb2394 commit 9779b76

File tree

3 files changed

+368
-7
lines changed

3 files changed

+368
-7
lines changed

Earthfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG TARGETARCH
55
## Default Image Repos Used in the Builds.
66
ARG SPECTRO_PUB_REPO=gcr.io/spectro-images-public
77
ARG SPECTRO_LUET_REPO=gcr.io/spectro-dev-public
8-
ARG KAIROS_BASE_IMAGE_URL=quay.io/kairos
8+
ARG KAIROS_BASE_IMAGE_URL=gcr.io/spectro-images-public
99
ARG ETCD_REPO=https://github.com/etcd-io
1010
FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0
1111

@@ -49,9 +49,9 @@ ARG ETCD_VERSION="v3.5.13"
4949

5050
IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$BASE_IMAGE" = "" ]
5151
IF [ "$OS_VERSION" == 22 ] || [ "$OS_VERSION" == 20 ]
52-
ARG BASE_IMAGE_TAG=$OS_DISTRIBUTION:$OS_VERSION.04-core-$ARCH-generic-$KAIROS_VERSION
52+
ARG BASE_IMAGE_TAG=kairos-$OS_DISTRIBUTION:$OS_VERSION.04-core-$ARCH-generic-$KAIROS_VERSION
5353
ELSE
54-
ARG BASE_IMAGE_TAG=$OS_DISTRIBUTION:$OS_VERSION-core-$ARCH-generic-$KAIROS_VERSION
54+
ARG BASE_IMAGE_TAG=kairos-$OS_DISTRIBUTION:$OS_VERSION-core-$ARCH-generic-$KAIROS_VERSION
5555
END
5656
ARG BASE_IMAGE=$KAIROS_BASE_IMAGE_URL/$BASE_IMAGE_TAG
5757
ELSE IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] && [ "$BASE_IMAGE" = "" ]
@@ -283,7 +283,7 @@ base-image:
283283
if dpkg -l linux-image-generic > /dev/null; then apt-mark hold linux-image-generic linux-headers-generic linux-generic; fi
284284
END
285285
RUN apt update && \
286-
apt upgrade -y
286+
apt upgrade --no-install-recommends -y
287287
RUN kernel=$(ls /boot/vmlinuz-* | tail -n1) && \
288288
ln -sf "${kernel#/boot/}" /boot/vmlinuz
289289
RUN kernel=$(ls /lib/modules | tail -n1) && \

image.lst

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
gcr.io/spectro-images-public/ubuntu:20.04-core-amd64-generic-v2.4.5
2-
gcr.io/spectro-images-public/ubuntu:22.04-core-amd64-generic-v2.4.5
3-
gcr.io/spectro-images-public/ubuntu:23.04-core-amd64-generic-v2.4.5
1+
gcr.io/spectro-images-public/kairos-ubuntu:20.04-core-amd64-generic-v2.4.5
2+
gcr.io/spectro-images-public/kairos-ubuntu:22.04-core-amd64-generic-v2.4.5
43
gcr.io/spectro-images-public/opensuse:leap-15.5-core-amd64-generic-v2.4.5
54
gcr.io/spectro-images-public/rhel8:core-amd64-generic-v2.4.5
65
gcr.io/spectro-images-public/slem:2.4.5
@@ -9,3 +8,5 @@ gcr.io/spectro-images-public/rhel-fips:v2.4.5
98

109
gcr.io/spectro-images-public/kairos-io/provider-kubeadm:v4.3.0
1110
gcr.io/spectro-images-public/stylus-linux-amd64:v4.3.1-rc6
11+
12+

0 commit comments

Comments
 (0)