Feature/app deployment docker fixes

app-deployment/nginx.conf

@@ -0,0 +1,53 @@
+# Running as non-root user will trigger warning.
+# user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+# Running as non-root user will trigger warning
+# for default /var/run/ prefix.
+pid        /tmp/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                        '$status $body_bytes_sent "$http_referer" '
+                        '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+    server_tokens   off;
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    # Non-root user will not have access to default
+    # /var/cache/nginx/ prefix.
+    client_body_temp_path   /tmp/client_temp 1 2;
+    proxy_temp_path         /tmp/proxy_temp 1 2;
+    fastcgi_temp_path       /tmp/fastcgi_temp 1 2;
+    uwsgi_temp_path         /tmp/uwsgi_temp 1 2;
+    scgi_temp_path          /tmp/scgi_temp 1 2;
+
+    server {
+        listen 80;
+        root  /usr/share/nginx/html;
+        include /etc/nginx/mime.types;
+
+        # If a react app URI is directly accessed we will get 404
+        # since there will be no file representing that path.
+        # Below config will load index.html file in such case and
+        # browser will load the proper path using JS.
+        location / {
+            try_files $uri /index.html;
+        }
+    }
+}

docker/docker-compose.build.yaml

@@ -36,9 +36,9 @@ services:
     build:
       dockerfile: docker/dockerfiles/x2text.Dockerfile
       context: ..
-  app-template:
-    image: unstract/app-template:${VERSION}
+  app-deployment:
+    image: unstract/app-deployment:${VERSION}
     build:
-      dockerfile: utils/dockerfiles/app-template.Dockerfile
+      dockerfile: docker/dockerfiles/app-deployment.Dockerfile
       context: ..
 

docker/docker-compose.yaml

@@ -157,11 +157,9 @@ services:
       - traefik.enable=false
 
   # app template react app
-  app-template:
-    image: unstract/app-template:${VERSION}
-    volumes:
-     - ./nginx.conf:/etc/nginx/nginx.conf
-    container_name: unstract-app-template
+  app-deployment:
+    image: unstract/app-deployment:${VERSION}
+    container_name: unstract-app-deployment
     # network_mode: host
     ports:
       - "3005:80"
@@ -171,7 +169,7 @@ services:
       - ENVIRONMENT=development
     labels:
       - traefik.enable=true
-      - traefik.http.services.app-template.loadbalancer.server.port=80
+      - traefik.http.services.app-deployment.loadbalancer.server.port=80
 
 volumes:   
   unstract_data:

docker/dockerfiles/app-template.Dockerfile → docker/dockerfiles/app-deployment.Dockerfile

@@ -1,7 +1,7 @@
 # Use an official Node.js runtime as the base image
-FROM node:16 AS build-stage
+FROM node:16 AS builder
 
-ENV APP_TEMPLATE_PATH unstract-app-deployment-templates/chat-templates
+ENV APP_TEMPLATE_PATH app-deployment
 # Set the working directory inside the container
 WORKDIR /app
 
@@ -23,7 +23,8 @@ RUN npm run build
 FROM nginx:1.25 AS production-stage
 
 # Copy the build files from the build-stage
-COPY --from=build-stage /app/build /usr/share/nginx/html
+COPY --from=builder /app/build /usr/share/nginx/html
+COPY --from=builder /app/nginx.conf /etc/nginx/nginx.conf
 
 # Expose port 80 for NGINX
 EXPOSE 80

docker/dockerfiles/worker.Dockerfile

@@ -31,7 +31,7 @@ RUN set -e; \
     pdm sync --prod --no-editable; \
     \
     # REF: https://docs.gunicorn.org/en/stable/deploy.html#using-virtualenv
-    pip install --no-cache-dir gunicorn gevent;
+    pip install --no-cache-dir gunicorn gunicorn[gthread];
 
 
 EXPOSE 5002