fix(CI1a): SHORT_SHA fallback til 'latest' ved manuell builds submit

This commit is contained in:
chrischristiansen-glitch 2026-06-10 02:46:23 +02:00
parent 290fab6ac5
commit d530aeea6f

View File

@ -2,42 +2,42 @@
# Deploy opax-mcp som separat Cloud Run-tjeneste # Deploy opax-mcp som separat Cloud Run-tjeneste
# Kjør: gcloud builds submit --config agents/mcp_server/cloudbuild.yaml . # Kjør: gcloud builds submit --config agents/mcp_server/cloudbuild.yaml .
substitutions:
_TAG: 'latest'
steps: steps:
- name: 'gcr.io/cloud-builders/docker' - name: 'gcr.io/cloud-builders/docker'
entrypoint: bash
args: args:
- build - '-c'
- '-t' - |
- 'us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$SHORT_SHA' TAG="${SHORT_SHA:-${_TAG}}"
- '-f' docker build \
- 'agents/mcp_server/Dockerfile' -t us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$$TAG \
- 'agents/mcp_server' -f agents/mcp_server/Dockerfile \
agents/mcp_server
- name: 'gcr.io/cloud-builders/docker' docker push us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$$TAG
args: echo "$$TAG" > /workspace/image_tag.txt
- push
- 'us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$SHORT_SHA'
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk' - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
entrypoint: gcloud entrypoint: bash
args: args:
- run - '-c'
- deploy - |
- opax-mcp TAG=$(cat /workspace/image_tag.txt)
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$SHORT_SHA' gcloud run deploy opax-mcp \
- '--region=us-central1' --image=us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$$TAG \
- '--platform=managed' --region=us-central1 \
- '--no-allow-unauthenticated' --platform=managed \
- '--service-account=jason-vauger@$PROJECT_ID.iam.gserviceaccount.com' --no-allow-unauthenticated \
- '--set-env-vars=GOOGLE_CLOUD_PROJECT=$PROJECT_ID,STATIC_BUCKET=opax-vauco-static,CLOUD_RUN_SERVICE=osvauco-agent' --service-account=jason-vauger@$PROJECT_ID.iam.gserviceaccount.com \
- '--set-secrets=MCP_SECRET=mcp-server-key:latest' --set-env-vars=GOOGLE_CLOUD_PROJECT=$PROJECT_ID,STATIC_BUCKET=opax-vauco-static,CLOUD_RUN_SERVICE=osvauco-agent \
- '--memory=512Mi' --set-secrets=MCP_SECRET=mcp-server-key:latest \
- '--cpu=1' --memory=512Mi \
- '--min-instances=0' --cpu=1 \
- '--max-instances=5' --min-instances=0 \
- '--timeout=60' --max-instances=5 \
--timeout=60
images:
- 'us-central1-docker.pkg.dev/$PROJECT_ID/osvauco-repo/opax-mcp:$SHORT_SHA'
options: options:
logging: CLOUD_LOGGING_ONLY logging: CLOUD_LOGGING_ONLY