kopia lustrzana https://github.com/jupyterhub/repo2docker
Use "local" label for local directory
rodzic
2448730b75
commit
db00d4982c
|
@ -745,8 +745,10 @@ class Repo2Docker(Application):
|
||||||
picked_buildpack = self.default_buildpack()
|
picked_buildpack = self.default_buildpack()
|
||||||
|
|
||||||
picked_buildpack.appendix = self.appendix
|
picked_buildpack.appendix = self.appendix
|
||||||
|
# Add metadata labels
|
||||||
picked_buildpack.labels['repo2docker.version'] = self.version
|
picked_buildpack.labels['repo2docker.version'] = self.version
|
||||||
picked_buildpack.labels['repo2docker.repo'] = self.repo
|
repo_label = 'local' if os.path.isdir(self.repo) else self.repo
|
||||||
|
picked_buildpack.labels['repo2docker.repo'] = repo_label
|
||||||
picked_buildpack.labels['repo2docker.ref'] = self.ref
|
picked_buildpack.labels['repo2docker.ref'] = self.ref
|
||||||
|
|
||||||
self.log.debug(picked_buildpack.render(),
|
self.log.debug(picked_buildpack.render(),
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
"""
|
"""
|
||||||
Test if labels are supplied correctly to the container
|
Test if labels are supplied correctly to the container
|
||||||
"""
|
"""
|
||||||
import time
|
|
||||||
from unittest.mock import Mock
|
|
||||||
from repo2docker.app import Repo2Docker
|
from repo2docker.app import Repo2Docker
|
||||||
from repo2docker.buildpacks import BuildPack
|
from repo2docker.buildpacks import BuildPack
|
||||||
from repo2docker import __version__
|
from repo2docker import __version__
|
||||||
import pytest
|
import pytest
|
||||||
|
from unittest.mock import Mock
|
||||||
|
|
||||||
|
|
||||||
|
URL = "https://github.com/binderhub-ci-repos/repo2docker-ci-clone-depth"
|
||||||
|
|
||||||
|
|
||||||
def test_buildpack_labels_rendered():
|
def test_buildpack_labels_rendered():
|
||||||
|
@ -18,9 +20,14 @@ def test_buildpack_labels_rendered():
|
||||||
assert 'LABEL second_label="anotherlabel"\n' in bp.render()
|
assert 'LABEL second_label="anotherlabel"\n' in bp.render()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('ref', ['some-branch', None])
|
@pytest.mark.parametrize('ref, repo, expected_repo_label', [
|
||||||
def test_labels(ref, tmpdir):
|
(None, URL, URL),
|
||||||
repo = str(tmpdir)
|
('some-ref', None, 'local'),
|
||||||
|
(None, None, 'local'),
|
||||||
|
])
|
||||||
|
def test_Repo2Docker_labels(ref, repo, expected_repo_label, tmpdir):
|
||||||
|
if repo is None:
|
||||||
|
repo = str(tmpdir)
|
||||||
if ref is not None:
|
if ref is not None:
|
||||||
argv = ['--ref', ref, repo]
|
argv = ['--ref', ref, repo]
|
||||||
else:
|
else:
|
||||||
|
@ -38,7 +45,7 @@ def test_labels(ref, tmpdir):
|
||||||
app.start()
|
app.start()
|
||||||
expected_labels = {
|
expected_labels = {
|
||||||
'repo2docker.ref': ref,
|
'repo2docker.ref': ref,
|
||||||
'repo2docker.repo': repo,
|
'repo2docker.repo': expected_repo_label,
|
||||||
'repo2docker.version': __version__,
|
'repo2docker.version': __version__,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue