Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
silver-platter
gitlab-deps
Commits
a78a90af
Commit
a78a90af
authored
Oct 20, 2019
by
ale
Browse files
Minor Python 3 fixes
parent
58567568
Changes
3
Show whitespace changes
Inline
Side-by-side
gitlab_docker_autodep/deps.py
View file @
a78a90af
...
...
@@ -65,7 +65,7 @@ def build_dependency_tree(gl, search_pattern=None, filter_pattern=None):
df
=
_fetch_dockerfile
(
gl
,
project
,
'master'
)
if
not
df
:
continue
base_image
=
_parse_dockerfile
(
df
)
base_image
=
_parse_dockerfile
(
df
.
decode
(
'utf-8'
)
)
if
not
base_image
:
logging
.
error
(
'ERROR: could not find base image for %s'
,
project
.
path_with_namespace
)
...
...
gitlab_docker_autodep/main.py
View file @
a78a90af
...
...
@@ -2,7 +2,10 @@ import argparse
import
logging
import
os
import
time
import
urlparse
try
:
import
urlparse
except
ImportError
:
import
urllib.parse
as
urlparse
from
.deps
import
rebuild_deps
from
.server
import
run_app
...
...
gitlab_docker_autodep/server.py
View file @
a78a90af
import
gitlab
import
Queue
import
threading
import
time
try
:
import
Queue
except
ImportError
:
import
queue
as
Queue
from
flask
import
Flask
,
request
,
make_response
from
.deps
import
build_dependency_tree
,
rebuild
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment