Combine Images Cleanup (#188)

.github/workflows/docker-build-and-push-on-tag.yml

@@ -38,4 +38,4 @@ jobs:
         file: ./backend/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: danswer/danswer-api-server:${{ github.ref_name }}
+        tags: danswer/danswer-backend:${{ github.ref_name }}

.github/workflows/docker-tag-latest.yml

@@ -33,8 +33,8 @@ jobs:
 
     - name: Pull, Tag and Push API Server Image
       run: |
-        docker pull danswer/danswer-api-server:${{ github.event.inputs.version }}
-        docker tag danswer/danswer-api-server:${{ github.event.inputs.version }} danswer/danswer-api-server:latest
-        docker push danswer/danswer-api-server:latest
-        docker manifest create danswer/danswer-api-server:latest danswer/danswer-api-server:latest
-        docker manifest push danswer/danswer-api-server:latest
+        docker pull danswer/danswer-backend:${{ github.event.inputs.version }}
+        docker tag danswer/danswer-backend:${{ github.event.inputs.version }} danswer/danswer-backend:latest
+        docker push danswer/danswer-backend:latest
+        docker manifest create danswer/danswer-backend:latest danswer/danswer-backend:latest
+        docker manifest push danswer/danswer-backend:latest

backend/Dockerfile

@@ -18,4 +18,6 @@ COPY ./alembic.ini /app/alembic.ini
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 ENV PYTHONPATH /app
-CMD ["/bin/sh", "-c", "alembic upgrade head && echo \"Starting Danswer Api Server\" && uvicorn danswer.main:app --host 0.0.0.0 --port 8080"]
+
+# By default this container does nothing, it is used by api server and background which specify their own CMD
+CMD ["tail", "-f", "/dev/null"]

deployment/docker_compose/docker-compose.dev.yml

@@ -1,10 +1,14 @@
 version: '3'
 services:
   api_server:
-    image: danswer/danswer-api-server:latest
+    image: danswer/danswer-backend:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
+    command: >
+      /bin/sh -c "alembic upgrade head &&
+      echo \"Starting Danswer Api Server\" &&
+      uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
     depends_on:
       - relational_db
       - vector_db
@@ -22,7 +26,7 @@ services:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
   background:
-    image: danswer/danswer-api-server:latest
+    image: danswer/danswer-backend:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
@@ -97,8 +101,8 @@ services:
     volumes:
       - ../data/nginx:/etc/nginx/conf.d
     command: > 
-      /bin/sh -c "envsubst '$$\{DOMAIN\}' < /etc/nginx/conf.d/app.conf.template.dev > /etc/nginx/conf.d/app.conf 
-      && while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\""
+      /bin/sh -c "envsubst '$$\{DOMAIN\}' < /etc/nginx/conf.d/app.conf.template.dev > /etc/nginx/conf.d/app.conf &&
+      while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\""
 volumes:
   local_dynamic_storage:
   file_connector_tmp_storage:  # used to store files uploaded by the user temporarily while we are indexing them

deployment/docker_compose/docker-compose.prod.yml

@@ -1,10 +1,14 @@
 version: '3'
 services:
   api_server:
-    image: danswer/danswer-api-server:latest
+    image: danswer/danswer-backend:latest
     build:
       context: ../../backend
       dockerfile: Dockerfile
+    command: >
+      /bin/sh -c "alembic upgrade head &&
+      echo \"Starting Danswer Api Server\" &&
+      uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
     depends_on:
       - relational_db
       - vector_db
@@ -20,10 +24,10 @@ services:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
   background:
-    image: danswer/danswer-api-server:latest
+    image: danswer/danswer-backend:latest
     build:
       context: ../../backend
-      dockerfile: Dockerfile.background
+      dockerfile: Dockerfile
     command: /usr/bin/supervisord
     depends_on:
       - relational_db

deployment/kubernetes/api_server-service-deployment.yaml

@@ -28,8 +28,15 @@ spec:
     spec:
       containers:
       - name: api-server
-        image: danswer/danswer-api-server:latest
+        image: danswer/danswer-backend:latest
         imagePullPolicy: IfNotPresent
+        command:
+          - "/bin/sh"
+          - "-c"
+          - |
+            alembic upgrade head &&
+            echo "Starting Danswer Api Server" &&
+            uvicorn danswer.main:app --host 0.0.0.0 --port 8080
         ports:
         - containerPort: 8080
         env:

deployment/kubernetes/background-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: background
-        image: danswer/danswer-api-server:latest
+        image: danswer/danswer-backend:latest
         imagePullPolicy: IfNotPresent
         command: ["/usr/bin/supervisord"]
         env:

deployment/kubernetes/qdrant-service-deployment.yaml

@@ -36,7 +36,7 @@ spec:
           mountPath: /qdrant/storage
         env:
         - name: QDRANT__TELEMETRY_DISABLED
-          value: true
+          value: "true"
       volumes:
       - name: qdrant-storage
         persistentVolumeClaim: