From a76976ae1f1d7cf8e3b9b38f5c40dca9db2d4c1b Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Mon, 6 Jan 2025 16:19:22 -0500 Subject: [PATCH 1/3] fix whitespace in directory name Signed-off-by: Jordan Dubrick --- models/{detr-resnet-101 => detr-resnet-101}/.dockerignore | 0 models/{detr-resnet-101 => detr-resnet-101}/Containerfile | 0 models/{detr-resnet-101 => detr-resnet-101}/README.md | 0 models/{detr-resnet-101 => detr-resnet-101}/config.env | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename models/{detr-resnet-101 => detr-resnet-101}/.dockerignore (100%) rename models/{detr-resnet-101 => detr-resnet-101}/Containerfile (100%) rename models/{detr-resnet-101 => detr-resnet-101}/README.md (100%) rename models/{detr-resnet-101 => detr-resnet-101}/config.env (100%) diff --git a/models/detr-resnet-101 /.dockerignore b/models/detr-resnet-101/.dockerignore similarity index 100% rename from models/detr-resnet-101 /.dockerignore rename to models/detr-resnet-101/.dockerignore diff --git a/models/detr-resnet-101 /Containerfile b/models/detr-resnet-101/Containerfile similarity index 100% rename from models/detr-resnet-101 /Containerfile rename to models/detr-resnet-101/Containerfile diff --git a/models/detr-resnet-101 /README.md b/models/detr-resnet-101/README.md similarity index 100% rename from models/detr-resnet-101 /README.md rename to models/detr-resnet-101/README.md diff --git a/models/detr-resnet-101 /config.env b/models/detr-resnet-101/config.env similarity index 100% rename from models/detr-resnet-101 /config.env rename to models/detr-resnet-101/config.env From 69ed212223fa53c68723c6a14f8c91359604c097 Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Mon, 6 Jan 2025 16:58:07 -0500 Subject: [PATCH 2/3] add logic for requiring config file for image builds Signed-off-by: Jordan Dubrick --- .github/workflows/validate-build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-build.yml b/.github/workflows/validate-build.yml index b04879d..1e727e8 100644 --- a/.github/workflows/validate-build.yml +++ b/.github/workflows/validate-build.yml @@ -30,7 +30,10 @@ jobs: for dir in ${ALL_CHANGED_FILES}; do echo "Change detected in $dir ..." cd $dir - if [ ! -f config.env ]; then + if [ ! -f config.env ] && ([ -f Dockerfile ] || [ -f Containerfile ]); then + echo "No config.env file present in changed directory that contains image files. Throwing error ..." + exit 1 + elif [ ! -f config.env ]; then echo "No config.env file present in changed directory, skipping ..." cd $BASE_DIR continue From dc49dc67343717dceb2d7cc56adedfd5b79dd9ce Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Tue, 7 Jan 2025 11:47:43 -0500 Subject: [PATCH 3/3] update container image arg Signed-off-by: Jordan Dubrick --- models/detr-resnet-101/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/detr-resnet-101/Containerfile b/models/detr-resnet-101/Containerfile index 8715d57..b97b8c7 100644 --- a/models/detr-resnet-101/Containerfile +++ b/models/detr-resnet-101/Containerfile @@ -10,7 +10,7 @@ FROM registry.access.redhat.com/ubi9/ubi-micro:9.4-9 # Can be substituted using the --build-arg defined above -ARG MODEL_URL=./detr-resnet-101 +ARG MODEL_URL=./ # By default the Model Server container image uses the AI Model stored in the model/model.file file. WORKDIR /model