tweaking nginx

Dockerfile

@@ -6,25 +6,36 @@ RUN mkdir -p /var/cache/nginx \
              /var/log/nginx \
              /var/lib/nginx
 RUN touch /var/run/nginx.pid
-RUN chown -R pn:pn /var/cache/nginx \
+RUN chown -R root:root /var/cache/nginx \
                        /var/log/nginx \
                        /var/lib/nginx \
                        /var/run/nginx.pid
 
-                       
-RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o _tempfile.bin
-RUN mkdir -p /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-RUN mv _tempfile.bin /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R root /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+
+ENV HOME=/home/root \
+    PATH=/home/root/.local/bin:$PATH
+WORKDIR $HOME/app
+
+RUN mkdir -p $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN chmod 777 $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+RUN chmod 777 $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+#RUN mv _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R root $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+RUN mkdir $HOME/app/node_modules
+RUN chmod 777 $HOME/app/node_modules
+
+# Install dependencies and build app as non-root
+#USER root
+
+#COPY --chown=root _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 
 # FROM node:20.6.1
-WORKDIR /app
-COPY --chown=root . /app
+
+COPY --chown=root . $HOME/app
 
 RUN yarn install
 
-EXPOSE 4444
+EXPOSE 1687
 
 CMD ["bash", "run.sh"]
 

README.md

@@ -4,7 +4,7 @@ emoji: 🐳
 colorFrom: yellow
 colorTo: gray
 sdk: docker
-app_port: 4444
+app_port: 1687
 ---
 # Omnitool.ai - Your Open Source AI Desktop
 

myNodeServer.js

@@ -1,87 +1,12 @@
 const fastify = require('fastify')({ logger: true });
-const { spawn } = require('child_process');
-
-let OMNITOOL_READY = false;
-let ALREADY_STARTING = false;
 let MANAGEMENT_SERVER_PORT = 7860;
 let SERVER_HOST = '0.0.0.0';
-console.log(`************ Management Server ************`);
-let omnitoolLogs = [];
-
-async function startOmnitoolServer() {
-    if (ALREADY_STARTING) return;
-    ALREADY_STARTING = true;
-
-    console.log('Starting Omnitool Server...');
-    return new Promise((resolve, reject) => {
-        const omnitoolStartProcess = spawn('./omnitool_start.sh');
-
-        omnitoolStartProcess.stdout.on('data', (data) => {
-            omnitoolLogs.push(data.toString());
-            console.log(`omnitool stdout: ${data}`);
-            if (data.toString().includes(`Server has started and is ready to accept connections`)) {
-                OMNITOOL_READY = true;
-                console.log('Omnitool server started successfully');
-                resolve();
-            }
-        });
-
-        omnitoolStartProcess.stderr.on('data', (data) => {
-            console.error(`omnitool stderr: ${data}`);
-        });
-
-        omnitoolStartProcess.on('close', (code) => {
-            console.log(`Omnitool server process exited with code ${code}`);
-            if (!OMNITOOL_READY) {
-                ALREADY_STARTING = false;
-                reject(`Omnitool server did not start within the timeout period.`);
-            }
-        });
-    });
-}
+console.log(`************ Management Server v 0.002 ************`);
 
 fastify.get('/', async (request, reply) => {
     const localUrl = request.headers['host'];
 
-    if (!OMNITOOL_READY) {
-        let htmlContent = `
-            <html>
-                <head><title>Proxy Server</title></head>
-                <body>
-                    <button id="startServerButton" onclick="startServer()">Start Omnitool Server</button>
-                    <button onclick="window.location.href='http://${localUrl}'">${localUrl}</button>
-                    <div id="logs" style="white-space: pre-wrap;"></div>
-                    <script>
-                        function startServer() {
-                            document.getElementById('startServerButton').disabled = true;
-                            fetch('/start-omnitool-server')
-                                .then(response => response.json())
-                                .then(data => {
-                                    startLogPolling();
-                                });
-                        }
-
-                        function startLogPolling() {
-                            const interval = setInterval(() => {
-                                fetch('/omnitool-logs')
-                                    .then(response => response.json())
-                                    .then(data => {
-                                        document.getElementById('logs').innerText = data.logs.join("\\n");
-                                        if (data.ready) {
-                                            clearInterval(interval);
-                                            window.location.reload(); // Refresh the page when Omnitool is ready
-                                        }
-                                    });
-                            }, 1000);
-                        }
-                        
-                        startLogPolling();
-                    </script>
-                </body>
-            </html>
-        `;
-        reply.type('text/html').send(htmlContent);
-    } else {
+  
         let htmlContent = `
         <html>
             <head><title>Proxy Server</title></head>
@@ -97,28 +22,6 @@ fastify.get('/', async (request, reply) => {
         </html>
     `;
     reply.type('text/html').send(htmlContent);
-    }
-});
-
-fastify.get('/omnitool-logs', async (request, reply) => {
-    reply.send({ logs: omnitoolLogs, ready: OMNITOOL_READY });
-});
-
-fastify.get('/start-omnitool-server', async (request, reply) => {
-    if (!OMNITOOL_READY) {
-        if (ALREADY_STARTING) {
-            return { message: "Omnitool server already starting" };
-        }
-        try {
-            await startOmnitoolServer();
-            reply.send({ message: "Omnitool server started successfully" });
-        } catch (error) {
-            console.error(error);
-            reply.send({ message: `Error starting Omnitool server: ${error}` });
-        }
-    } else {
-        reply.send({ message: "Omnitool server already running" });
-    }
 });
 
 const start = async () => {

nginx.conf

@@ -1,12 +1,12 @@
 server {
-    listen 4444 default_server;
-    listen [::]:4444 default_server;
+    listen 1687 default_server;
+    listen [::]:1687 default_server;
 
     server_name _;
 
     location / {
-        # Serve myNodeServer 7860
-        proxy_pass http://localhost:7860;
+        # Serve myNodeServer 1689
+        proxy_pass http://localhost:1689;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';

run.sh

@@ -1,18 +1,27 @@
 #!/bin/bash
 
 # Start Nginx
+echo "Starting Nginx..."
 service nginx start
 
 # Start the Node.js server in the background
-node myNodeServer.js --port 7860 --host 0.0.0.0 & echo $! > node_server.pid
+echo "Starting Node.js server..."
+node myNodeServer.js --port 1689 --host 0.0.0.0 & echo $! > node_server.pid
 
 # Start the main application with yarn in the background
-# yarn
-# yarn start -u -rb -R blocks & echo $! > yarn_service.pid
+echo "Starting Yarn..."
+yarn
+
+echo "Starting Yarn service..."
+yarn start -u -rb -R blocks & echo $! > yarn_service.pid
 
 # The script waits here for the yarn start process to terminate
-wait $(cat node_server.pid)
+echo "Waiting for Yarn to terminate..."
+wait $(cat yarn_service.pid)
 
 # Cleanup: terminate and clean up background services
+echo "Cleaning up..."
 pkill -F node_server.pid
-rm node_server.pid
+
+echo "killing .pid files..."
+rm node_server.pid yarn_service.pid