Skip to content

Commit

Permalink
Make repository optional and renamed test_mode to local_mode
Browse files Browse the repository at this point in the history 
Signed-off-by: Benedikt Blumenstiel <benedikt.blumenstiel@ibm.com>
  • Loading branch information
@blumenstiel
blumenstiel committed Feb 1, 2024
1 parent a92900b commit 8e2ab60
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 67 deletions.
61 changes: 30 additions & 31 deletions src/c3/create_gridwrapper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def main():
parser.add_argument('-l', '--log_level', type=str, default='INFO')
parser.add_argument('--dockerfile_template_path', type=str, default='',
help='Path to custom dockerfile template')
parser.add_argument('--test_mode', action='store_true',
parser.add_argument('--local_mode', action='store_true',
help='Continue processing after docker errors.')
parser.add_argument('--no-cache', action='store_true', help='Not using cache for docker build.')
parser.add_argument('--skip-logging', action='store_true',
Expand All @@ -180,36 +180,35 @@ def main():
cos=args.cos,
)

if args.repository is not None:
logging.info('Generate CLAIMED operator for grid wrapper')

# Add component path and init file path to additional_files
args.ADDITIONAL_FILES.append(component_path)

# Update dockerfile template if specified
if args.dockerfile_template_path != '':
logging.info(f'Uses custom dockerfile template from {args.dockerfile_template_path}')
with open(args.dockerfile_template_path, 'r') as f:
custom_dockerfile_template = Template(f.read())
else:
custom_dockerfile_template = None

create_operator(
file_path=grid_wrapper_file_path,
repository=args.repository,
version=args.version,
custom_dockerfile_template=custom_dockerfile_template,
additional_files=args.ADDITIONAL_FILES,
log_level=args.log_level,
test_mode=args.test_mode,
no_cache=args.no_cache,
overwrite_files=args.overwrite,
rename_files=args.rename,
skip_logging=args.skip_logging,
)

logging.info('Remove local component file')
os.remove(component_path)
logging.info('Generate CLAIMED operator for grid wrapper')

# Add component path and init file path to additional_files
args.ADDITIONAL_FILES.append(component_path)

# Update dockerfile template if specified
if args.dockerfile_template_path != '':
logging.info(f'Uses custom dockerfile template from {args.dockerfile_template_path}')
with open(args.dockerfile_template_path, 'r') as f:
custom_dockerfile_template = Template(f.read())
else:
custom_dockerfile_template = None

create_operator(
file_path=grid_wrapper_file_path,
repository=args.repository,
version=args.version,
custom_dockerfile_template=custom_dockerfile_template,
additional_files=args.ADDITIONAL_FILES,
log_level=args.log_level,
local_mode=args.local_mode,
no_cache=args.no_cache,
overwrite_files=args.overwrite,
rename_files=args.rename,
skip_logging=args.skip_logging,
)

logging.info('Remove local component file')
os.remove(component_path)


if __name__ == '__main__':
Expand Down
77 changes: 41 additions & 36 deletions src/c3/create_operator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ def create_operator(file_path: str,
custom_dockerfile_template: Optional[Template],
additional_files: str = None,
log_level='INFO',
test_mode=False,
local_mode=False,
no_cache=False,
rename_files=None,
overwrite_files=False,
skip_logging=False,
):
logging.info('Parameters: ')
logging.info('file_path: ' + file_path)
logging.info('repository: ' + repository)
logging.info('repository: ' + str(repository))
logging.info('version: ' + str(version))
logging.info('additional_files: ' + str(additional_files))

Expand Down Expand Up @@ -350,49 +350,54 @@ def create_operator(file_path: str,
# auto increase version based on registered images
version = get_image_version(repository, name)

if repository is None:
if not local_mode:
logging.warning('No repository provided. The container image is only saved locally. Add `-r <repository>` '
'to push the image to a container registry or run `--local_mode` to suppress this warning.')
local_mode = True

logging.info(f'Building container image claimed-{name}:{version}')
try:
# Run docker build
subprocess.run(
f"docker build --platform linux/amd64 -t claimed-{name}:{version} . {'--no-cache' if no_cache else ''}",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True
)

# Run docker tag
logging.debug(f'Tagging images with "latest" and "{version}"')
subprocess.run(
f"docker tag claimed-{name}:{version} {repository}/claimed-{name}:{version}",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
subprocess.run(
f"docker tag claimed-{name}:{version} {repository}/claimed-{name}:latest",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
if repository is not None:
# Run docker tag
logging.debug(f'Tagging images with "latest" and "{version}"')
subprocess.run(
f"docker tag claimed-{name}:{version} {repository}/claimed-{name}:{version}",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
subprocess.run(
f"docker tag claimed-{name}:{version} {repository}/claimed-{name}:latest",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
except Exception as err:
remove_temporary_files(file_path, target_code)
logging.error('Docker build failed. Consider running C3 with `--log_level DEBUG` to see the docker build logs.')
raise err
logging.info('Successfully built image')
logging.info(f'Successfully built image claimed-{name}:{version}')

logging.info(f'Pushing images to registry {repository}')
try:
# Run docker push
subprocess.run(
f"docker push {repository}/claimed-{name}:latest",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
subprocess.run(
f"docker push {repository}/claimed-{name}:{version}",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
logging.info('Successfully pushed image to registry')
except Exception as err:
logging.error(f'Could not push images to namespace {repository}. '
f'Please check if docker is logged in or select a namespace with access.')
if test_mode:
logging.info('Continue processing (test mode).')
pass
else:
if local_mode:
logging.info(f'No repository provided, skip docker push.')
else:
logging.info(f'Pushing images to registry {repository}')
try:
# Run docker push
subprocess.run(
f"docker push {repository}/claimed-{name}:latest",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
subprocess.run(
f"docker push {repository}/claimed-{name}:{version}",
stdout=None if log_level == 'DEBUG' else subprocess.PIPE, check=True, shell=True,
)
logging.info('Successfully pushed image to registry')
except Exception as err:
logging.error(f'Could not push images to namespace {repository}. '
f'Please check if docker is logged in or select a namespace with access.')
remove_temporary_files(file_path, target_code)
raise err

Expand Down Expand Up @@ -423,7 +428,7 @@ def main():
help='Path to python script or notebook')
parser.add_argument('ADDITIONAL_FILES', type=str, nargs='*',
help='Paths to additional files to include in the container image')
parser.add_argument('-r', '--repository', type=str, required=True,
parser.add_argument('-r', '--repository', type=str, default=None,
help='Container registry address, e.g. docker.io/<username>')
parser.add_argument('-v', '--version', type=str, default=None,
help='Container image version. Auto-increases the version number if not provided (default 0.1)')
Expand All @@ -433,7 +438,7 @@ def main():
parser.add_argument('-l', '--log_level', type=str, default='INFO')
parser.add_argument('--dockerfile_template_path', type=str, default='',
help='Path to custom dockerfile template')
parser.add_argument('--test_mode', action='store_true',
parser.add_argument('--local_mode', action='store_true',
help='Continue processing after docker errors.')
parser.add_argument('--no-cache', action='store_true', help='Not using cache for docker build.')
parser.add_argument('--skip-logging', action='store_true',
Expand Down Expand Up @@ -464,7 +469,7 @@ def main():
custom_dockerfile_template=custom_dockerfile_template,
additional_files=args.ADDITIONAL_FILES,
log_level=args.log_level,
test_mode=args.test_mode,
local_mode=args.local_mode,
no_cache=args.no_cache,
overwrite_files=args.overwrite,
rename_files=args.rename,
Expand Down

0 comments on commit 8e2ab60

Please sign in to comment.