AI-Cognitive-Leap/agnes-the-ai-analyst
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge: real CalVer + commit SHA in UI badge

Browse source
This commit is contained in:
ZdenekSrotyr 2026-04-21 21:00:42 +02:00
commit e4f6910398
3 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/release.yml vendored
View file

@ -115,6 +115,7 @@ jobs:
build-args: | build-args: |
AGNES_VERSION=${{ steps.meta.outputs.version }} AGNES_VERSION=${{ steps.meta.outputs.version }}
RELEASE_CHANNEL=${{ steps.meta.outputs.channel }} RELEASE_CHANNEL=${{ steps.meta.outputs.channel }}
AGNES_COMMIT_SHA=${{ github.sha }}
tags: | tags: |
ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.channel }} ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.channel }}
ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.versioned_tag }} ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.versioned_tag }}

2
Dockerfile
View file

@ -8,8 +8,10 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
ARG AGNES_VERSION=dev ARG AGNES_VERSION=dev
ARG RELEASE_CHANNEL=dev ARG RELEASE_CHANNEL=dev
ARG AGNES_COMMIT_SHA=unknown
ENV AGNES_VERSION=${AGNES_VERSION} ENV AGNES_VERSION=${AGNES_VERSION}
ENV RELEASE_CHANNEL=${RELEASE_CHANNEL} ENV RELEASE_CHANNEL=${RELEASE_CHANNEL}
ENV AGNES_COMMIT_SHA=${AGNES_COMMIT_SHA}
WORKDIR /app WORKDIR /app

26
infra/modules/customer-instance/startup-script.sh.tpl
View file

@ -68,24 +68,11 @@ if [ "$DATA_SOURCE" = "keboola" ]; then
fi fi
JWT_KEY=$(gcloud secrets versions access latest --secret=agnes-$${CUSTOMER_NAME}-jwt-secret) JWT_KEY=$(gcloud secrets versions access latest --secret=agnes-$${CUSTOMER_NAME}-jwt-secret)
# Resolve the actual version/commit behind the requested tag so the UI can # AGNES_VERSION, RELEASE_CHANNEL, AGNES_COMMIT_SHA are baked into the image
# show specific `stable-2026.04.47` + commit SHA instead of just `stable`. # itself as ENV (see Dockerfile ARG/ENV + release.yml build-args). We do NOT
IMAGE_DIGEST=$(docker pull "$IMAGE_REPO:$IMAGE_TAG" 2>/dev/null | grep -o 'sha256:[a-f0-9]*' | head -1 || echo "unknown") # set them here — doing so would override the image-level values with the
IMAGE_INFO=$(curl -fsSL "https://ghcr.io/v2/keboola/agnes-the-ai-analyst/manifests/$IMAGE_TAG" -H "Accept: application/vnd.oci.image.manifest.v1+json" 2>/dev/null || echo "{}") # floating tag name ("stable"/"dev"), hiding the real CalVer / git SHA.
# The app picks them up from the image's runtime environment.
# Channel derived from tag prefix (stable-*/dev-*/release-*) — simple heuristic.
case "$IMAGE_TAG" in
stable*) RELEASE_CHANNEL="stable" ;;
dev*) RELEASE_CHANNEL="dev" ;;
release*) RELEASE_CHANNEL="release" ;;
*) RELEASE_CHANNEL="custom" ;;
esac
# Version extracted from versioned tags (stable-2026.04.N); floating tags stay "dev".
case "$IMAGE_TAG" in
*-[0-9]*.[0-9]*.[0-9]*) AGNES_VERSION="$${IMAGE_TAG#*-}" ;;
*) AGNES_VERSION="$IMAGE_TAG" ;;
esac
cat > "$APP_DIR/.env" <<ENVEOF cat > "$APP_DIR/.env" <<ENVEOF
JWT_SECRET_KEY=$JWT_KEY JWT_SECRET_KEY=$JWT_KEY
@ -97,9 +84,6 @@ SEED_ADMIN_EMAIL=$SEED_ADMIN_EMAIL
LOG_LEVEL=info LOG_LEVEL=info
DOMAIN=$DOMAIN DOMAIN=$DOMAIN
AGNES_TAG=$IMAGE_TAG AGNES_TAG=$IMAGE_TAG
AGNES_VERSION=$AGNES_VERSION
RELEASE_CHANNEL=$RELEASE_CHANNEL
AGNES_COMMIT_SHA=$IMAGE_DIGEST
ACME_EMAIL=$ACME_EMAIL ACME_EMAIL=$ACME_EMAIL
ENVEOF ENVEOF
chmod 600 "$APP_DIR/.env" chmod 600 "$APP_DIR/.env"