highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-10-02 17:38:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Version from Tag not picked up (#705)

Browse Source
This commit is contained in:
Yuhong Sun
2023-11-06 20:01:20 -08:00
committed by GitHub
parent abf9cc3248
commit 4f64444f0f
7 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-build-push-backend-container-on-tag.yml vendored
View File

@@ -33,4 +33,4 @@ jobs:
danswer/danswer-backend:${{ github.ref_name }} danswer/danswer-backend:${{ github.ref_name }}
danswer/danswer-backend:latest danswer/danswer-backend:latest
build-args: | build-args: |
DANSWER_VERSION: ${{ github.ref_name }} DANSWER_VERSION:${{ github.ref_name }}

2
.github/workflows/docker-build-push-model-server-container-on-tag.yml vendored
View File

@@ -33,4 +33,4 @@ jobs:
danswer/danswer-model-server:${{ github.ref_name }} danswer/danswer-model-server:${{ github.ref_name }}
danswer/danswer-model-server:latest danswer/danswer-model-server:latest
build-args: | build-args: |
DANSWER_VERSION: ${{ github.ref_name }} DANSWER_VERSION:${{ github.ref_name }}

2
.github/workflows/docker-build-push-web-container-on-tag.yml vendored
View File

@@ -33,4 +33,4 @@ jobs:
danswer/danswer-web-server:${{ github.ref_name }} danswer/danswer-web-server:${{ github.ref_name }}
danswer/danswer-web-server:latest danswer/danswer-web-server:latest
build-args: | build-args: |
DANSWER_VERSION: ${{ github.ref_name }} DANSWER_VERSION:${{ github.ref_name }}

1
backend/Dockerfile
View File

@@ -3,6 +3,7 @@ FROM python:3.11.4-slim-bookworm
# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
ARG DANSWER_VERSION=0.2-dev ARG DANSWER_VERSION=0.2-dev
ENV DANSWER_VERSION=${DANSWER_VERSION} ENV DANSWER_VERSION=${DANSWER_VERSION}
RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
# Install system dependencies # Install system dependencies
RUN apt-get update && \ RUN apt-get update && \

1
backend/Dockerfile.model_server
View File

@@ -3,6 +3,7 @@ FROM python:3.11.4-slim-bookworm
# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
ARG DANSWER_VERSION=0.2-dev ARG DANSWER_VERSION=0.2-dev
ENV DANSWER_VERSION=${DANSWER_VERSION} ENV DANSWER_VERSION=${DANSWER_VERSION}
RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
COPY ./requirements/model_server.txt /tmp/requirements.txt COPY ./requirements/model_server.txt /tmp/requirements.txt
RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt

4
backend/danswer/main.py
View File

@@ -227,5 +227,7 @@ app = get_application()
if __name__ == "__main__": 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) uvicorn.run(app, host=APP_HOST, port=APP_PORT)

1
web/Dockerfile
View File

@@ -3,6 +3,7 @@ FROM node:20-alpine AS base
# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions. # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
ARG DANSWER_VERSION=0.2-dev ARG DANSWER_VERSION=0.2-dev
ENV DANSWER_VERSION=${DANSWER_VERSION} ENV DANSWER_VERSION=${DANSWER_VERSION}
RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
# Step 1. Install dependencies only when needed # Step 1. Install dependencies only when needed
FROM base AS deps FROM base AS deps