Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git application #184

Merged
merged 85 commits into from
Dec 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
611cbfe
Initial commit
Oct 25, 2018
35a885a
UI
Oct 25, 2018
0a662c9
Initial code with logic
Oct 29, 2018
dd7bc65
Debug push and pull methods
Oct 30, 2018
c624c92
Move UI into dashboard
Oct 30, 2018
5f6f582
Couple of fixes
Oct 30, 2018
2794eb1
Again some fixes
Oct 30, 2018
0a59aed
Some appearance changes
Oct 30, 2018
1c21e8a
Some fixes
Oct 31, 2018
a7d21ba
Fixed updating
Oct 31, 2018
8c6db07
Again fix
Oct 31, 2018
da69807
Changed request structure
Oct 31, 2018
1d02912
Removed extra comments
Oct 31, 2018
9c7c640
Sync dump & push
Oct 31, 2018
96542fb
Fixed heads
Oct 31, 2018
345afa7
Push in client, diffs
Nov 1, 2018
e2d2a53
Merge diffs
Nov 1, 2018
bf430bd
Async requests
Nov 1, 2018
f57f4ec
Updated plugin interface on the server, removed extra request to serv…
Nov 2, 2018
807d9de
Updated diffs dir, some refactoring
Nov 2, 2018
2332109
Changed diff structure
Nov 2, 2018
4bb94aa
Check of empty repos
Nov 2, 2018
7f0f466
Initialization of installation
Nov 2, 2018
9758e90
Some bugs were fixed
Nov 2, 2018
ad51be5
eslint fixes
Nov 2, 2018
e78157d
Extra code was removed
Nov 2, 2018
90f7204
Updated documentation
Nov 2, 2018
f5db517
netcat-openbsd installation
Nov 2, 2018
8d8342a
Git LFS support
Nov 22, 2018
09a2d43
SSH connection errors are processed now
Nov 22, 2018
4199bc0
Exception handlers were added
Nov 22, 2018
afbf4e7
Fixed git lfs
Nov 22, 2018
6d0ffbb
Fixed regular expression
Nov 22, 2018
e6adab8
Fixed: silent response for client
Nov 22, 2018
d7de71e
zip installation
Nov 22, 2018
7ade7c6
Reset text after reopen dialog window
Nov 22, 2018
eecdaa5
Updated migration
bsekachev Nov 26, 2018
2644c92
Removed update button
bsekachev Nov 26, 2018
ab6c380
Aligned field
bsekachev Nov 26, 2018
051dae5
Repository checking before cloning
bsekachev Nov 26, 2018
850e400
Improved status
bsekachev Nov 26, 2018
712b347
Removed extra code
bsekachev Nov 26, 2018
941a1a6
Updated client part
bsekachev Nov 27, 2018
9633471
Updated migration
bsekachev Nov 27, 2018
ec5836c
Some bugs in prod were fixed
bsekachev Nov 27, 2018
ded7ede
git-url-parse [MIT] instead of manual parsing
bsekachev Nov 27, 2018
85f4c47
Single create task request
bsekachev Nov 27, 2018
5fb4860
No CVAT_HEADLESS data, git url parse library removed, some refactoring
bsekachev Nov 28, 2018
666c4f1
SSH auto generating
bsekachev Nov 28, 2018
a92e908
SSH, permissions, multiple projects in single repository support, xml…
bsekachev Nov 28, 2018
0eeef4b
Sync buttons only if repository is attached
bsekachev Nov 28, 2018
d20ca03
branch name and changelog file contains task info
bsekachev Nov 28, 2018
cc3c748
Fixed some bugs
bsekachev Nov 28, 2018
da15292
Move to kernel functionality
bsekachev Nov 28, 2018
e7c896b
Some fixes
bsekachev Nov 28, 2018
6b6a3dc
Updated README.md
bsekachev Nov 28, 2018
04071ca
Removed ssh app, git installation instructions inside Dockerfile
bsekachev Nov 29, 2018
d506ac7
SSH setupping fixed
bsekachev Nov 29, 2018
e36e3f0
Init host before getting remote status
bsekachev Nov 29, 2018
ba843db
Synchronization status added
bsekachev Nov 30, 2018
22b04b9
Couple of fixes
bsekachev Dec 3, 2018
af10ace
Couple of fixes
bsekachev Dec 4, 2018
dbb3e4e
SSH generating updated
bsekachev Dec 5, 2018
48551ef
Couple of fixes
bsekachev Dec 5, 2018
db161b8
Async server process for git updating
bsekachev Dec 5, 2018
933cbbb
Changed timeout
bsekachev Dec 5, 2018
ac9fc94
.xml -> .dump
bsekachev Dec 11, 2018
a20e8cb
change status to not_sync onsave
bsekachev Dec 11, 2018
ceaee47
Single ssh agent
bsekachev Dec 11, 2018
f6869ed
Fix bug after deleting branch on a remote repos
bsekachev Dec 11, 2018
930b14f
Several keys
bsekachev Dec 12, 2018
dd09b41
Couple fixes
bsekachev Dec 12, 2018
76e9ead
Merged develop
bsekachev Dec 27, 2018
4fbf7fe
Codacy fixes
bsekachev Dec 27, 2018
f6cabd9
Other codacy fixes
bsekachev Dec 27, 2018
36d4e80
XML instead of DUMP, keys in the ssh directory, minor fixes
bsekachev Dec 27, 2018
40cd40b
Updated README.md, keys inside ssh dir, removed config file, enum for…
bsekachev Dec 28, 2018
77d8380
Removed extra command from Dockerfile
bsekachev Dec 28, 2018
c1e09b9
SSH agent from supervisord
bsekachev Dec 28, 2018
6f91e88
Socket is removed if it exists before a ssh-agent initialization
bsekachev Dec 28, 2018
ba8b367
Fixed grammar
bsekachev Dec 28, 2018
34e7d56
A little bit more comments
bsekachev Dec 28, 2018
08e0260
Removed file lock dependency
bsekachev Dec 28, 2018
a8ee8ad
Updated README.md
bsekachev Dec 28, 2018
03403a3
Updated README.md
bsekachev Dec 28, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
/logs
/components/openvino/*.tgz
/profiles
/ssh/*
!/ssh/README.md


# Ignore temporary files
docker-compose.override.yml
Expand Down
20 changes: 20 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -93,6 +112,7 @@
"CVAT Server",
"CVAT RQ - default",
"CVAT RQ - low",
"CVAT git",
]
}
]
Expand Down
20 changes: 18 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading