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