From 4f64444f0f3b590c6a242493fab37abc7eafe069 Mon Sep 17 00:00:00 2001 From: Yuhong Sun Date: Mon, 6 Nov 2023 20:01:20 -0800 Subject: [PATCH] Fix Version from Tag not picked up (#705) --- .../workflows/docker-build-push-backend-container-on-tag.yml | 2 +- .../docker-build-push-model-server-container-on-tag.yml | 2 +- .github/workflows/docker-build-push-web-container-on-tag.yml | 2 +- backend/Dockerfile | 1 + backend/Dockerfile.model_server | 1 + backend/danswer/main.py | 4 +++- web/Dockerfile | 1 + 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index 3945d37c3..5bf9cf253 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -33,4 +33,4 @@ jobs: danswer/danswer-backend:${{ github.ref_name }} danswer/danswer-backend:latest build-args: | - DANSWER_VERSION: ${{ github.ref_name }} + DANSWER_VERSION:${{ github.ref_name }} diff --git a/.github/workflows/docker-build-push-model-server-container-on-tag.yml b/.github/workflows/docker-build-push-model-server-container-on-tag.yml index 30a8d2e4a..c6a47da13 100644 --- a/.github/workflows/docker-build-push-model-server-container-on-tag.yml +++ b/.github/workflows/docker-build-push-model-server-container-on-tag.yml @@ -33,4 +33,4 @@ jobs: danswer/danswer-model-server:${{ github.ref_name }} danswer/danswer-model-server:latest build-args: | - DANSWER_VERSION: ${{ github.ref_name }} + DANSWER_VERSION:${{ github.ref_name }} diff --git a/.github/workflows/docker-build-push-web-container-on-tag.yml b/.github/workflows/docker-build-push-web-container-on-tag.yml index de49850b2..2b73d571d 100644 --- a/.github/workflows/docker-build-push-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-web-container-on-tag.yml @@ -33,4 +33,4 @@ jobs: danswer/danswer-web-server:${{ github.ref_name }} danswer/danswer-web-server:latest build-args: | - DANSWER_VERSION: ${{ github.ref_name }} + DANSWER_VERSION:${{ github.ref_name }} diff --git a/backend/Dockerfile b/backend/Dockerfile index 4519c0535..ae9b678b2 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,6 +3,7 @@ FROM python:3.11.4-slim-bookworm # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. ARG DANSWER_VERSION=0.2-dev ENV DANSWER_VERSION=${DANSWER_VERSION} +RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}" # Install system dependencies RUN apt-get update && \ diff --git a/backend/Dockerfile.model_server b/backend/Dockerfile.model_server index 1ff4b038e..ebb446447 100644 --- a/backend/Dockerfile.model_server +++ b/backend/Dockerfile.model_server @@ -3,6 +3,7 @@ FROM python:3.11.4-slim-bookworm # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. ARG DANSWER_VERSION=0.2-dev ENV DANSWER_VERSION=${DANSWER_VERSION} +RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}" COPY ./requirements/model_server.txt /tmp/requirements.txt RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt diff --git a/backend/danswer/main.py b/backend/danswer/main.py index 1c84beba2..11131a104 100644 --- a/backend/danswer/main.py +++ b/backend/danswer/main.py @@ -227,5 +227,7 @@ app = get_application() if __name__ == "__main__": - logger.info(f"Starting Danswer Backend on http://{APP_HOST}:{str(APP_PORT)}/") + logger.info( + f"Starting Danswer Backend version {__version__} on http://{APP_HOST}:{str(APP_PORT)}/" + ) uvicorn.run(app, host=APP_HOST, port=APP_PORT) diff --git a/web/Dockerfile b/web/Dockerfile index 9688844de..325b49394 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -3,6 +3,7 @@ FROM node:20-alpine AS base # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. ARG DANSWER_VERSION=0.2-dev ENV DANSWER_VERSION=${DANSWER_VERSION} +RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}" # Step 1. Install dependencies only when needed FROM base AS deps