Skip to content

Commit

Permalink
Fix Version from Tag not picked up (#705)
Browse files Browse the repository at this point in the history
  • Loading branch information
yuhongsun96 authored Nov 7, 2023
1 parent abf9cc3 commit 4f64444
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 1 addition & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
1 change: 1 addition & 0 deletions backend/Dockerfile.model_server
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion backend/danswer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,7 @@ def startup_event() -> None:


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)
1 change: 1 addition & 0 deletions web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

1 comment on commit 4f64444

@vercel
Copy link

@vercel vercel bot commented on 4f64444 Nov 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.