Git application (#184)

cvat-ai · Dec 28, 2018 · 23b6b54 · 23b6b54
1 parent 1c38c6d
commit 23b6b54
Show file tree

Hide file tree

Showing 40 changed files with 1,549 additions and 415 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@
 /logs
 /components/openvino/*.tgz
 /profiles
+/ssh/*
+!/ssh/README.md
+
 
 # Ignore temporary files
 docker-compose.override.yml

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -84,6 +84,25 @@
             "env": {},
             "envFile": "${workspaceFolder}/.env",
         },
+        {
+            "name": "CVAT git",
+            "type": "python",
+            "request": "launch",
+            "debugStdLib": true,
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/manage.py",
+            "args": [
+                "update_git_states"
+            ],
+            "debugOptions": [
+                "RedirectOutput",
+                "DjangoDebugging"
+            ],
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+        },
     ],
     "compounds": [
         {
@@ -93,6 +112,7 @@
                 "CVAT Server",
                 "CVAT RQ - default",
                 "CVAT RQ - low",
+                "CVAT git",
             ]
         }
     ]

diff --git a/Dockerfile b/Dockerfile
@@ -3,11 +3,13 @@ FROM ubuntu:16.04
 ARG http_proxy
 ARG https_proxy
 ARG no_proxy
+ARG socks_proxy
 
 ENV TERM=xterm \
     http_proxy=${http_proxy}   \
     https_proxy=${https_proxy} \
-    no_proxy=${no_proxy}
+    no_proxy=${no_proxy} \
+    socks_proxy=${socks_proxy}
 
 ENV LANG='C.UTF-8'  \
     LC_ALL='C.UTF-8'
@@ -102,9 +104,23 @@ COPY cvat/requirements/ /tmp/requirements/
 COPY supervisord.conf mod_wsgi.conf wait-for-it.sh manage.py ${HOME}/
 RUN  pip3 install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
 COPY cvat/ ${HOME}/cvat
+
+COPY ssh ${HOME}/.ssh
+
+# Install git application dependencies
+RUN apt-get update && \
+    apt-get install -y ssh netcat-openbsd git curl zip  && \
+    curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
+    apt-get install -y git-lfs && \
+    git lfs install && \
+    rm -rf /var/lib/apt/lists/* && \
+    if [ -n ${socks_proxy} ]; then \
+        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30 -o ProxyCommand='nc -X 5 -x ${socks_proxy} %h %p'\"" >> ${HOME}/.bashrc; \
+    fi
+
 COPY tests ${HOME}/tests
 RUN patch -p1 < ${HOME}/cvat/apps/engine/static/engine/js/3rdparty.patch
-RUN  chown -R ${USER}:${USER} .
+RUN chown -R ${USER}:${USER} .
 
 # RUN all commands below as 'django' user
 USER ${USER}

diff --git a/cvat/apps/auto_annotation/static/auto_annotation/js/auto_annotation.js b/cvat/apps/auto_annotation/static/auto_annotation/js/auto_annotation.js
@@ -25,7 +25,7 @@ window.cvat.dashboard.uiCallbacks.push(function(newElements) {
                 let elem = $(this);
                 let tid = +elem.attr("id").split("_")[1];
 
-                const autoAnnoButton = $("<button> Run auto annotation </button>").addClass("semiBold dashboardButtonUI dashboardAutoAnno");
+                const autoAnnoButton = $("<button> Run auto annotation </button>").addClass("regular dashboardButtonUI dashboardAutoAnno");
                 autoAnnoButton.appendTo(elem.find("div.dashboardButtonsUI")[0]);
 
                 if (tid in data && data[tid].active) {