Skip to content

Commit

Permalink
feat: freeze jina version in hub build
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoanFM
JoanFM committed Jan 4, 2021
1 parent 35139e9 commit 0cb7b03
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 12 deletions.
1 change: 1 addition & 0 deletions jina/docker/checker.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def get_exist_path(directory, s):
if os.path.exists(r):
return r


def get_summary_path(image_name: str):
return os.path.join(tempfile.gettempdir(), image_name.replace('/', '_') + '_summary.json')

Expand Down
49 changes: 37 additions & 12 deletions jina/docker/hubio.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ def push(self, name: str = None, readme_path: str = None, build_result: Dict = N
docker_creds = _docker_auth(logger=self.logger)
if docker_creds and docker_creds['docker_username'] and docker_creds['docker_password']:
self.logger.info(f'Fetched docker credentials successfully. Pushing now...')
self._push_docker_hub(name, readme_path, docker_creds['docker_username'], docker_creds['docker_password'])
self._push_docker_hub(name, readme_path, docker_creds['docker_username'],
docker_creds['docker_password'])
else:
self.logger.error(f'Failed to fetch docker login creds. Aborting push.')
return
Expand All @@ -209,7 +210,8 @@ def push(self, name: str = None, readme_path: str = None, build_result: Dict = N
if isinstance(e, ImageAlreadyExists):
raise e

def _push_docker_hub(self, name: str = None, readme_path: str = None, docker_username: str = None, docker_password: str = None) -> None:
def _push_docker_hub(self, name: str = None, readme_path: str = None, docker_username: str = None,
docker_password: str = None) -> None:
""" Helper push function """
check_registry(self.args.registry, name, self.args.repository)
self._check_docker_image(name)
Expand Down Expand Up @@ -288,7 +290,7 @@ def _docker_login(self, docker_username: str = None, docker_password: str = None
login_password = docker_password
if self.args.username and self.args.password:
login_username = self.args.username
login_password = self.args.password
login_password = self.args.password
if login_username and login_password:
try:
self._client.login(username=login_username, password=login_password,
Expand All @@ -310,6 +312,7 @@ def build(self) -> Dict:
with TimeContext(f'building {colored(self.args.path, "green")}', self.logger) as tc:
try:
self._check_completeness()
self._freeze_jina_version()

streamer = self._raw_client.build(
decode=True,
Expand Down Expand Up @@ -504,15 +507,37 @@ def _write_summary_to_file(self, summary: Dict) -> None:
json.dump(summary, f)
self.logger.debug(f'stored the summary from build to {file_path}')

def _freeze_jina_version(self) -> None:
import pkg_resources
from jina import __version__
jina_core_version = __version__
requirements_path = get_exist_path(self.args.path, 'requirements.txt')
if requirements_path and os.path.exists(requirements_path):
new_requirements = []
update = False
with open(requirements_path, 'r') as fp:
requirements = pkg_resources.parse_requirements(fp)
for req in requirements:
if 'jina' in str(req):
update = True
self.logger.info(f'Freezing jina version to {jina_core_version}')
new_requirements.append(f'jina=={jina_core_version}')
else:
new_requirements.append(str(req))

if update:
with open(requirements_path, 'w') as fp:
fp.write('\n'.join(new_requirements))

def _check_completeness(self) -> Dict:
self.dockerfile_path = get_exist_path(self.args.path, 'Dockerfile')
self.manifest_path = get_exist_path(self.args.path, 'manifest.yml')
dockerfile_path = get_exist_path(self.args.path, 'Dockerfile')
manifest_path = get_exist_path(self.args.path, 'manifest.yml')
self.config_yaml_path = get_exist_path(self.args.path, 'config.yml')
self.readme_path = get_exist_path(self.args.path, 'README.md')
self.requirements_path = get_exist_path(self.args.path, 'requirements.txt')
requirements_path = get_exist_path(self.args.path, 'requirements.txt')

yaml_glob = set(glob.glob(os.path.join(self.args.path, '*.yml')))
yaml_glob.difference_update({self.manifest_path, self.config_yaml_path})
yaml_glob.difference_update({manifest_path, self.config_yaml_path})

if not self.config_yaml_path:
self.config_yaml_path = yaml_glob.pop()
Expand All @@ -522,11 +547,11 @@ def _check_completeness(self) -> Dict:
test_glob = glob.glob(os.path.join(self.args.path, 'tests/test_*.py'))

completeness = {
'Dockerfile': self.dockerfile_path,
'manifest.yml': self.manifest_path,
'Dockerfile': dockerfile_path,
'manifest.yml': manifest_path,
'config.yml': self.config_yaml_path,
'README.md': self.readme_path,
'requirements.txt': self.requirements_path,
'requirements.txt': requirements_path,
'*.yml': yaml_glob,
'*.py': py_glob,
'tests': test_glob
Expand All @@ -543,9 +568,9 @@ def _check_completeness(self) -> Dict:
self.logger.critical('Dockerfile or manifest.yml is not given, can not build')
raise FileNotFoundError('Dockerfile or manifest.yml is not given, can not build')

self.manifest = self._read_manifest(self.manifest_path)
self.manifest = self._read_manifest(manifest_path)
self.manifest['jina_version'] = jina_version
self.dockerfile_path_revised = self._get_revised_dockerfile(self.dockerfile_path, self.manifest)
self.dockerfile_path_revised = self._get_revised_dockerfile(dockerfile_path, self.manifest)
tag_name = safe_url_name(
f'{self.args.repository}/' + f'{self.manifest["type"]}.{self.manifest["kind"]}.{self.manifest["name"]}:{self.manifest["version"]}-{jina_version}')
self.tag = tag_name
Expand Down

0 comments on commit 0cb7b03

Please sign in to comment.