f

Author: yetone

container_images/buildah/Dockerfile

@@ -7,6 +7,19 @@ RUN touch /etc/subgid /etc/subuid \
 
 ENV BUILDAH_ISOLATION=chroot
 
+ARG BENTO_USER=bentoml
+ARG BENTO_USER_UID=1034
+ARG BENTO_USER_GID=1034
+RUN groupadd -g $BENTO_USER_GID -o $BENTO_USER && useradd -m -u $BENTO_USER_UID -g $BENTO_USER_GID -o -r $BENTO_USER
+
+RUN echo $BENTO_USER:$BENTO_USER_UID:$BENTO_USER_GID >> /etc/subuid \
+  && echo $BENTO_USER:$BENTO_USER_UID:$BENTO_USER_GID >> /etc/subgid
+
+RUN echo "export BUILDAH_ISOLATION=chroot" >> /home/build/.bashrc
+
+RUN mkdir -p /home/build/.config/containers \
+ && (echo '[storage]';echo 'driver = "vfs"') > /home/build/.config/containers/storage.conf
+
 USER build
 WORKDIR /home/build
 

container_images/buildah/Makefile

@@ -1,4 +1,4 @@
-IMAGE := quay.io/bentoml/bentoml-buildah:0.0.1
+IMAGE := quay.io/bentoml/bentoml-buildah:0.0.3
 
 build:
 	docker build -t ${IMAGE} .

controllers/resources/bentorequest_controller.go

@@ -1604,6 +1604,10 @@ echo "Done"
 				inClusterImageName,
 			),
 		}
+		envs = append(envs, corev1.EnvVar{
+			Name:  "BUILDAH_ISOLATION",
+			Value: "chroot",
+		})
 	default:
 		err = errors.Errorf("unknown bento image build engine %s", buildEngine)
 		return

helm/yatai-image-builder/values.yaml

@@ -100,7 +100,7 @@ internalImages:
   kaniko: quay.io/bentoml/kaniko:1.9.1
   buildkit: quay.io/bentoml/buildkit:master
   buildkitRootless: quay.io/bentoml/buildkit:master-rootless
-  buildah: quay.io/bentoml/bentoml-buildah:0.0.1
+  buildah: quay.io/bentoml/bentoml-buildah:0.0.2
 
 bentoImageBuildEngine: kaniko # options: kaniko, buildkit, buildkit-rootless
 runInOpenshift: false

scripts/start-dev.sh

@@ -58,5 +58,9 @@ function trap_handler() {
 trap trap_handler EXIT
 
 echo "⌛ starting yatai-image-builder..."
-env $(kubectl -n yatai-image-builder get secret yatai-image-builder-env -o jsonpath='{.data}' | $jq 'to_entries|map("\(.key)=\(.value|@base64d)")|.[]' | xargs) make run
+env $(kubectl -n yatai-image-builder get secret yatai-image-builder-env -o jsonpath='{.data}' | $jq 'to_entries|map("\(.key)=\(.value|@base64d)")|.[]' | xargs) \
+  BENTO_IMAGE_BUILD_ENGINE=buildah \
+  INTERNAL_IMAGES_BENTO_DOWNLOADER=quay.io/bentoml/bento-downloader:0.0.3 \
+  INTERNAL_IMAGES_BUILDAH=quay.io/bentoml/bentoml-buildah:0.0.2 \
+  make run
 

tests/e2e/installation_test.sh

@@ -2,12 +2,12 @@
 
 set -xe
 
-kubectl create ns yatai-system
-kubectl create ns yatai-image-builder
+kubectl create ns yatai-system || true
+kubectl create ns yatai-image-builder || true
 kubectl create ns yatai || true
 
 echo "🚀 Creating AWS Secret Access Key..."
-kubectl create secret generic aws-secret-access-key --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} --namespace yatai-image-builder
+kubectl create secret generic aws-secret-access-key --from-literal=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} --namespace yatai-image-builder || true
 echo "🚀 Installing yatai-image-builder..."
 YATAI_ENDPOINT='empty' USE_LOCAL_HELM_CHART=true UPGRADE_CRDS=false AWS_SECRET_ACCESS_KEY_EXISTING_SECRET_NAME=aws-secret-access-key AWS_SECRET_ACCESS_KEY_EXISTING_SECRET_KEY=AWS_SECRET_ACCESS_KEY bash ./scripts/quick-install-yatai-image-builder.sh
 echo "yatai-image-builder helm release values:"