manu-sapiens commited on
Commit
4a05547
·
1 Parent(s): e4ee203

including omnitool again but cleanedup from git files

Browse files
Files changed (5) hide show
  1. Dockerfile +8 -7
  2. myNodeServer.js +1 -1
  3. omnitool +1 -0
  4. omnitool_start.sh +5 -29
  5. prepare.sh +32 -0
Dockerfile CHANGED
@@ -4,13 +4,14 @@ USER node
4
  WORKDIR /app
5
 
6
  RUN chmod 777 /app
7
- #RUN chmod 777 /app/omnitool
8
- #RUN mkdir -p /app/omnitool/node_modules
9
- #RUN chmod 777 /app/omnitool/node_modules
10
- #RUN mkdir -p /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
11
- #RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
12
- #RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
13
- #RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 
14
 
15
  RUN chown -Rh $user:$user /app
16
  #RUN chown -Rh $user:$user /app/omnitool
 
4
  WORKDIR /app
5
 
6
  RUN chmod 777 /app
7
+ RUN mkdir -p /app/omnitool
8
+ RUN chmod 777 /app/omnitool
9
+ RUN mkdir -p /app/omnitool/node_modules
10
+ RUN chmod 777 /app/omnitool/node_modules
11
+ RUN mkdir -p /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
12
+ RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
13
+ RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
14
+ RUN chmod 777 /app/omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
15
 
16
  RUN chown -Rh $user:$user /app
17
  #RUN chown -Rh $user:$user /app/omnitool
myNodeServer.js CHANGED
@@ -3,7 +3,7 @@
3
  * All rights reserved.
4
  */
5
  //@ts-check
6
- const VERSION = '0.6.0.hf.006';
7
 
8
  const express = require('express');
9
  const http = require('http');
 
3
  * All rights reserved.
4
  */
5
  //@ts-check
6
+ const VERSION = '0.6.0.hf.007b';
7
 
8
  const express = require('express');
9
  const http = require('http');
omnitool ADDED
@@ -0,0 +1 @@
 
 
1
+ Subproject commit 8cc31bba952351a937b58b010635022f01ccff06
omnitool_start.sh CHANGED
@@ -2,44 +2,20 @@
2
  echo "--- START ---"
3
 
4
  echo "--- GIT OMNITOOL ---"
5
- git clone https://github.com/omnitool-ai/omnitool
6
  mkdir -p ./omnitool/node_modules
7
  chmod 777 ./omnitool/node_modules
8
 
9
- echo "--- CHECKING /DATA ---"
10
- if [ -d "/data" ] && [ ! -L "/app/omnitool/packages/omni-server/data.local" ]; then
11
- # Backup the existing data.local directory
12
- echo "--- Backup the existing data.local directory ---"
13
-
14
- if [ -d "/app/omnitool/packages/omni-server/data.local" ]; then
15
- mv /app/omnitool/packages/omni-server/data.local /app/omnitool/packages/omni-server/data.local.org
16
- fi
17
-
18
- # Create the symlink
19
- echo "--- Create the symlink ---"
20
-
21
- ln -s /data /app/omnitool/packages/omni-server/data.local
22
-
23
- # Copy data from backup to symlink if backup exists
24
- echo "--- Copy data from backup to symlink if backup exists ---"
25
-
26
- if [ -d "/app/omnitool/packages/omni-server/data.local.org" ]; then
27
- cp -a /app/omnitool/packages/omni-server/data.local.org/. /app/omnitool/packages/omni-server/data.local/
28
- # Cleanup
29
- rm -rf /app/omnitool/packages/omni-server/data.local.org
30
- echo "--- Cleanup done ---"
31
-
32
- fi
33
  else
34
- echo "--- NO /data folder DETECTED, SKIPPING symlink creation ---"
35
  fi
36
 
37
  echo "--- CD OMNITOOL ---"
38
  cd omnitool
39
 
40
- echo "--- GIT PULL ---"
41
- git pull
42
-
43
  echo "--- YARN INSTALL ---"
44
  yarn
45
 
 
2
  echo "--- START ---"
3
 
4
  echo "--- GIT OMNITOOL ---"
5
+ #git clone https://github.com/omnitool-ai/omnitool
6
  mkdir -p ./omnitool/node_modules
7
  chmod 777 ./omnitool/node_modules
8
 
9
+ echo "--- CHECKING EXISTING /DATA ---"
10
+ if [ -d "/data" ]; then
11
+ echo "$(ls -l /data)"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  else
13
+ echo "--- NO /DATA DETECTED ---"
14
  fi
15
 
16
  echo "--- CD OMNITOOL ---"
17
  cd omnitool
18
 
 
 
 
19
  echo "--- YARN INSTALL ---"
20
  yarn
21
 
prepare.sh ADDED
@@ -0,0 +1,32 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ echo " PREPARING for HUGGING FACE "
2
+
3
+ if [ -d "./omnitool/" ]; then
4
+ echo "[_] OMNITOOL ALREADY EXISTS "
5
+ else
6
+ echo "[x] CLONING FOR OMNITOOL GIT "
7
+ git clone https://github.com/omnitool-ai/omnitool
8
+ fi
9
+
10
+ if [ -d "./omnitool/.git" ]; then
11
+ echo "[x] REMOVING GIT files "
12
+ rm -rf ./omnitool/.git/
13
+ rm ./omnitool/.gitignore
14
+ rm ./omnitool/.gitattributes
15
+ else
16
+ echo "[_] NO GIT FILES DETECTED "
17
+ fi
18
+
19
+ if [ -f "./omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1" ]; then
20
+ echo "[x] REMOVING large file from OMNITOOL distribution "
21
+ rm ./omnitool/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
22
+ else
23
+ echo "[_] NO LARGE FILE DETECTED "
24
+ fi
25
+
26
+ if [ "$(ls -A ./omnitool/assets)" ]; then
27
+ echo "[x] REMOVING ASSETS "
28
+ rm -rf ./omnitool/assets/
29
+ mkdir -p ./omnitool/assets
30
+ else
31
+ echo "[_] NO ASSETS DETECTED "
32
+ fi