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.

Sign up for GitHub

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

Jump to bottom

Added argument dockerfile #61

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Added argument dockerfile #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21659c7
Added argument dockerfile
blumenstiel Apr 8, 2024
ab746e1
Fixed typo
blumenstiel Apr 8, 2024
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 src/c3/create_gridwrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ 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('--dockerfile', type=str, default='dockerfile.generated',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should use Dockerfile.generated over dockerfile.generated - as Dockerfile is de-factor standard

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!

help='Name or path of the generated dockerfile.')
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.')
Expand Down Expand Up @@ -230,6 +232,7 @@ def main():
skip_logging=args.skip_logging,
keep_generated_files=args.keep_generated_files,
platform=args.platform,
dockerfile=args.dockerfile,
)
except Exception as err:
logging.error('Error while generating CLAIMED grid wrapper. '
Expand Down
19 changes: 12 additions & 7 deletions src/c3/create_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
CLAIMED_VERSION = 'V0.1'


def create_dockerfile(dockerfile_template, requirements, target_code, target_dir, additional_files, working_dir, command):
def create_dockerfile(dockerfile_template, dockerfile, requirements, target_code, target_dir, additional_files,
working_dir, command):
# Check for requirements file
for i in range(len(requirements)):
if '-r ' in requirements[i]:
Expand Down Expand Up @@ -52,9 +53,9 @@ def create_dockerfile(dockerfile_template, requirements, target_code, target_dir
)

logging.info('Create Dockerfile')
with open("Dockerfile", "w") as text_file:
with open(dockerfile, "w") as text_file:
text_file.write(docker_file)
logging.debug('Dockerfile:\n' + docker_file)
logging.debug(f'{dockerfile}:\n' + docker_file)


def create_kfp_component(name, description, repository, version, command, target_code, target_dir, file_path, inputs, outputs):
Expand Down Expand Up @@ -237,6 +238,7 @@ def create_operator(file_path: str,
skip_logging=False,
keep_generated_files=False,
platform='linux/amd64',
dockerfile='Dockerfile.generated',
):
logging.info('Parameters: ')
logging.info('file_path: ' + file_path)
Expand Down Expand Up @@ -345,8 +347,8 @@ def create_operator(file_path: str,
logging.info(f'Found {len(additional_files_found)} additional files and directories\n'
f'{", ".join(additional_files_found)}')

create_dockerfile(dockerfile_template, requirements, target_code, target_dir, additional_files_found, working_dir,
command)
create_dockerfile(dockerfile_template, dockerfile, requirements, target_code, target_dir, additional_files_found,
working_dir, command)

if version is None:
# auto increase version based on registered images
Expand All @@ -362,10 +364,10 @@ def create_operator(file_path: str,
if subprocess.run('docker buildx', shell=True, stdout=subprocess.PIPE).returncode == 0:
# Using docker buildx
logging.debug('Using docker buildx')
build_command = 'docker buildx build'
build_command = f'docker buildx build -f {dockerfile}'
else:
logging.debug('Using docker build. Consider installing docker-buildx.')
build_command = 'docker build'
build_command = f'docker build -f {dockerfile}'

logging.info(f'Building container image claimed-{name}:{version}')
try:
Expand Down Expand Up @@ -453,6 +455,8 @@ 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('--dockerfile', type=str, default='dockerfile.generated',
help='Name or path of the generated dockerfile.')
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.')
Expand Down Expand Up @@ -496,6 +500,7 @@ def main():
skip_logging=args.skip_logging,
keep_generated_files=args.keep_generated_files,
platform=args.platform,
dockerfile=args.dockerfile,
)


Expand Down