Merge branch 'main' into ob-v0-10-5

Author: mathieu-benoit

.devcontainer/installMoreTools.sh

@@ -23,5 +23,17 @@ sudo mv ./kind /usr/local/bin/kind
 sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq
 sudo chmod +x /usr/bin/yq
 
+# docker model-plugin
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+echo \
+"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get install -y docker-model-plugin
+docker model list
+
 cd ..
-rm -rf install-more-tools
+rm -rf install-more-tools

.github/workflows/ci.yaml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - uses: score-spec/setup-score@v2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: score-spec/setup-score@9ce358a6641972930fbf1c91d93185fec520f7e4 # v3.1.8
         with:
           file: score-compose
           version: latest
           token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: score-spec/setup-score@v2
+      - uses: score-spec/setup-score@9ce358a6641972930fbf1c91d93185fec520f7e4 # v3.1.8
         with:
           file: score-k8s
           version: latest

samples/aks-store-demo/Makefile

@@ -14,14 +14,12 @@ help:
 .score-compose/state.yaml:
 	score-compose init \
 		--no-sample \
-		--provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml \
-		--provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/llm-model/score-compose/10-dmr-llm-model.provisioners.yaml
+		--provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml
 
-compose.yaml: order/score.yaml product/score-ai.yaml store-front/score.yaml store-admin/score.yaml makeline/score.yaml .score-compose/state.yaml Makefile
+compose.yaml: order/score.yaml product/score.yaml store-front/score.yaml store-admin/score.yaml makeline/score.yaml .score-compose/state.yaml Makefile
 	score-compose generate \
 		order/score.yaml \
-		ai/score.yaml \
-		product/score-ai.yaml \
+		product/score.yaml \
 		store-front/score.yaml \
 		store-admin/score.yaml \
 		makeline/score.yaml
@@ -101,4 +99,4 @@ k8s-down:
 	kubectl delete \
 		-f manifests.yaml \
 		-n ${NAMESPACE}
-	sleep 5
+	sleep 5

samples/aks-store-demo/ai/score.yaml

@@ -33,4 +33,5 @@ resources:
   llm-model:
     type: llm-model
     params:
-      model: ai/smollm2:135M-Q2_K #ai/gpt-oss:latest
+      model: ai/smollm2:135M-Q4_0
+      #model: ai/gpt-oss:latest