Spaces:
Running
Running
Commit ·
0526d9d
1
Parent(s): 18e92b1
ngix 4444 edition
Browse files- .dockerignore +3 -0
- .gitignore +3 -0
- .mercs.yaml +4 -4
- Dockerfile +3 -1
- README.md +2 -2
- myNodeServer.js +1 -1
- nginx.conf +2 -2
- packages/omni-server/src/run.ts +1 -1
- yarn.lock +0 -0
.dockerignore
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
.local.bin/
|
| 2 |
+
packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
|
| 3 |
+
assets/
|
.gitignore
CHANGED
|
@@ -9,6 +9,9 @@ dist-ssr
|
|
| 9 |
omni.zip
|
| 10 |
fossa*
|
| 11 |
.fossa.yml
|
|
|
|
|
|
|
|
|
|
| 12 |
|
| 13 |
tsconfig.tsbuildinfo
|
| 14 |
/**/*/public/t
|
|
|
|
| 9 |
omni.zip
|
| 10 |
fossa*
|
| 11 |
.fossa.yml
|
| 12 |
+
assets/
|
| 13 |
+
packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
|
| 14 |
+
packages/omni-server/scripts/huggingface.js
|
| 15 |
|
| 16 |
tsconfig.tsbuildinfo
|
| 17 |
/**/*/public/t
|
.mercs.yaml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
server:
|
| 2 |
network:
|
| 3 |
-
public_url: http://
|
| 4 |
rateLimit:
|
| 5 |
global: false
|
| 6 |
max: 1000
|
|
@@ -111,7 +111,7 @@ server:
|
|
| 111 |
cdn:
|
| 112 |
type: local
|
| 113 |
useLocalRoute: true #whether to use the local route or seaweed returned public url for serving images
|
| 114 |
-
localRoute: 'http://
|
| 115 |
kvStorage:
|
| 116 |
dbPath: './data.local/db'
|
| 117 |
|
|
@@ -119,11 +119,11 @@ server:
|
|
| 119 |
default_ttl: 7d #default ttl for temp artifacts
|
| 120 |
# ${{ if navigator.platform.startsWith("Win") }}:
|
| 121 |
# root: 'c://temp//cdn'
|
| 122 |
-
# url: '
|
| 123 |
# insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
|
| 124 |
# ${{ else }}:
|
| 125 |
root: './data.local/files'
|
| 126 |
-
url: '
|
| 127 |
insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
|
| 128 |
|
| 129 |
routes:
|
|
|
|
| 1 |
server:
|
| 2 |
network:
|
| 3 |
+
public_url: http://127.0.0.1:1688
|
| 4 |
rateLimit:
|
| 5 |
global: false
|
| 6 |
max: 1000
|
|
|
|
| 111 |
cdn:
|
| 112 |
type: local
|
| 113 |
useLocalRoute: true #whether to use the local route or seaweed returned public url for serving images
|
| 114 |
+
localRoute: 'http://127.0.0.1:1688/fid'
|
| 115 |
kvStorage:
|
| 116 |
dbPath: './data.local/db'
|
| 117 |
|
|
|
|
| 119 |
default_ttl: 7d #default ttl for temp artifacts
|
| 120 |
# ${{ if navigator.platform.startsWith("Win") }}:
|
| 121 |
# root: 'c://temp//cdn'
|
| 122 |
+
# url: '127.0.0.1:1688'
|
| 123 |
# insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
|
| 124 |
# ${{ else }}:
|
| 125 |
root: './data.local/files'
|
| 126 |
+
url: '127.0.0.1:1688'
|
| 127 |
insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
|
| 128 |
|
| 129 |
routes:
|
Dockerfile
CHANGED
|
@@ -35,7 +35,9 @@ COPY --chown=root . $HOME/app
|
|
| 35 |
|
| 36 |
RUN yarn install
|
| 37 |
|
| 38 |
-
EXPOSE
|
|
|
|
|
|
|
| 39 |
|
| 40 |
CMD ["bash", "run.sh"]
|
| 41 |
|
|
|
|
| 35 |
|
| 36 |
RUN yarn install
|
| 37 |
|
| 38 |
+
EXPOSE 4444
|
| 39 |
+
EXPOSE 1688
|
| 40 |
+
EXPOSE 1689
|
| 41 |
|
| 42 |
CMD ["bash", "run.sh"]
|
| 43 |
|
README.md
CHANGED
|
@@ -1,10 +1,10 @@
|
|
| 1 |
---
|
| 2 |
-
title: O T 3 - nginx edition
|
| 3 |
emoji: 🐳
|
| 4 |
colorFrom: yellow
|
| 5 |
colorTo: gray
|
| 6 |
sdk: docker
|
| 7 |
-
app_port:
|
| 8 |
---
|
| 9 |
# Omnitool.ai - Your Open Source AI Desktop
|
| 10 |
|
|
|
|
| 1 |
---
|
| 2 |
+
title: O T 3 - nginx edition 4444
|
| 3 |
emoji: 🐳
|
| 4 |
colorFrom: yellow
|
| 5 |
colorTo: gray
|
| 6 |
sdk: docker
|
| 7 |
+
app_port: 4444
|
| 8 |
---
|
| 9 |
# Omnitool.ai - Your Open Source AI Desktop
|
| 10 |
|
myNodeServer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
const fastify = require('fastify')({ logger: true });
|
| 2 |
-
let MANAGEMENT_SERVER_PORT =
|
| 3 |
let SERVER_HOST = '0.0.0.0';
|
| 4 |
console.log(`************ Management Server v 0.002 ************`);
|
| 5 |
|
|
|
|
| 1 |
const fastify = require('fastify')({ logger: true });
|
| 2 |
+
let MANAGEMENT_SERVER_PORT = 1689;
|
| 3 |
let SERVER_HOST = '0.0.0.0';
|
| 4 |
console.log(`************ Management Server v 0.002 ************`);
|
| 5 |
|
nginx.conf
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
server {
|
| 2 |
-
listen
|
| 3 |
-
listen [::]:
|
| 4 |
|
| 5 |
server_name _;
|
| 6 |
|
|
|
|
| 1 |
server {
|
| 2 |
+
listen 7860 default_server;
|
| 3 |
+
listen [::]:7860 default_server;
|
| 4 |
|
| 5 |
server_name _;
|
| 6 |
|
packages/omni-server/src/run.ts
CHANGED
|
@@ -229,7 +229,7 @@ const boot = async (options: OptionValues) => {
|
|
| 229 |
// needs to be reworked. But for now this allows us to run code on both client and server.
|
| 230 |
const apiConfig: IAPIServerServiceConfig = {
|
| 231 |
id: 'api',
|
| 232 |
-
host: 'http://
|
| 233 |
integrationsUrl: '/api/v1/mercenaries/integrations'
|
| 234 |
};
|
| 235 |
server.use(APIServerService, apiConfig);
|
|
|
|
| 229 |
// needs to be reworked. But for now this allows us to run code on both client and server.
|
| 230 |
const apiConfig: IAPIServerServiceConfig = {
|
| 231 |
id: 'api',
|
| 232 |
+
host: 'http://127.0.0.1:1688', // remote API is disabled?
|
| 233 |
integrationsUrl: '/api/v1/mercenaries/integrations'
|
| 234 |
};
|
| 235 |
server.use(APIServerService, apiConfig);
|
yarn.lock
CHANGED
|
The diff for this file is too large to render.
See raw diff
|
|
|