Merge pull request #5 from danny-avila/main

Merge latest from source

Author: danorlando

Dockerfile-app

@@ -0,0 +1,35 @@
+# ./Dockerfile
+
+FROM node:19-alpine
+WORKDIR /app
+
+# Copy package.json files for client and api
+COPY /client/package*.json /app/client/
+COPY /api/package*.json /app/api/
+
+# Install dependencies for both client and api
+RUN cd /app/client && npm ci
+RUN cd /app/api && npm ci
+
+# Copy the current directory contents into the container
+COPY /client/ /app/client/
+COPY /api/ /app/api/
+
+# Set the memory limit for Node.js
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+
+# Build webpack artifacts for the client
+RUN cd /app/client && npm run build
+
+# Create the necessary directory and copy the client side code to the api directory
+RUN mkdir -p /app/api/client && cp -R /app/client/dist /app/api/client/dist
+
+# Make port 3080 available to the world outside this container
+EXPOSE 3080
+
+# Expose the server to 0.0.0.0
+ENV HOST=0.0.0.0
+
+# Run the app when the container launches
+WORKDIR /app/api
+CMD ["npm", "start"]

client/src/components/Messages/Message.jsx

@@ -150,9 +150,8 @@ export default function Message({
               ) : edit ? (
                 <div className="flex min-h-[20px] flex-grow flex-col items-start gap-4 ">
                   {/* <div className={`${blinker ? 'result-streaming' : ''} markdown prose dark:prose-invert light w-full break-words`}> */}
-
                   <div
-                    className="markdown prose dark:prose-invert light w-full break-words border-none focus:outline-none"
+                    className="markdown prose dark:prose-invert light w-full whitespace-pre-wrap break-words border-none focus:outline-none"
                     contentEditable={true}
                     ref={textEditor}
                     suppressContentEditableWarning={true}

docker-compose.yml

@@ -15,13 +15,14 @@ services:
   #     - api
   api:
     ports:
-      - 3080:3080               # Change it to 9000:3080 if you want to use nginx
+      - 3080:3080               # Change it to 9000:3080 to use nginx
     depends_on:
       - mongodb
-    image: node-api
-    build:
-      context: .
-      target: node-api
+    # image: node-api            # Uncomment this to build from local file
+    # build:
+    #   context: .
+    #   target: node-api
+    image: chatgptclone/app:0.3.3 # Comment this & uncomment above to build from local file
     restart: always
     env_file:
       - ./api/.env