backports sync

Makefile

@@ -418,6 +418,9 @@ ecosystem-debian-bookworm-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/main    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/develop    && pwd && make build && make deploy
+	make ecosystem-debian-bookworm-jdk-images
+
+ecosystem-debian-bookworm-jdk-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8    && pwd && make build && make deploy

bin/ansible/roles/atlassian.bitbucket/files/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/atlassian.bitbucket/files/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/atlassian.jira/files/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/atlassian.jira/files/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php70/ad/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php70/ad/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php70/ldap/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php70/ldap/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php70/main/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php70/main/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php71/ad/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php71/ad/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php71/ldap/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php71/ldap/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php71/main/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php71/main/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php72/ad/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php72/ad/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php72/ldap/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php72/ldap/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php72/main/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php72/main/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php74/ad/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php74/ad/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php74/ldap/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php74/ldap/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php74/main/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php74/main/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php81/ad/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php81/ad/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php81/ldap/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php81/ldap/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/ansible/roles/gurock.testrail/files/php81/main/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

bin/ansible/roles/gurock.testrail/files/php81/main/kaniko-build.py

@@ -1,194 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.0.1"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    with ThreadPoolExecutor() as executor:
-        futures = []
-        for service_name, service_data in services.items():
-            build_data = service_data.get('build', {})
-            build_context = build_data.get('context', '.')
-            dockerfile = build_data.get('dockerfile', 'Dockerfile')
-            image_name = service_data.get('image')
-            build_args = build_data.get('args', {})
-            
-            # Substitute environment variables with their values if they exist
-            build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-            
-            if not image_name:
-                logging.warning(f"No image specified for service {service_name}")
-                continue
-            
-            futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-        
-        for future in as_completed(futures):
-            try:
-                future.result()
-            except Exception as exc:
-                logging.error(f"Generated an exception: {exc}")
-
-if __name__ == '__main__':
-    main()

bin/kaniko/_deploy.py

@@ -27,7 +27,7 @@ def main():
     ignore_directory = os.path.join(root_directory, 'win32')
     
     # List of files to copy
-    files_to_copy = ['kaniko-build.py', 'requirements.txt']
+    files_to_copy = ['requirements.txt']
     
     # Check if the source files exist in the script directory
     for file_name in files_to_copy:

bin/kaniko/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

bin/kaniko/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/mattermost/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/mattermost/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/mattermost/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/14/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/14/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/14/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/15/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/15/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/15/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/16/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/16/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/16/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/17/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/17/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/17/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/18/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/18/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/18/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/19/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/19/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/19/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/20/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/20/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/20/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/21/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/21/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/21/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/22/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/22/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/22/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/23/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/23/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/23/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/24/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/24/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/24/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/25/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/25/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/25/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/26/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/26/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/26/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/27/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/27/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/27/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/28/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/28/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/28/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/29/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/29/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/29/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/patched/latest/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/patched/latest/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/patched/latest/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/pure/14/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/pure/14/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/pure/14/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/pure/15/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/pure/15/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()

linux/advanced/nextcloud/pure/15/requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
 python-dotenv
+kaniko-wrapper

linux/advanced/nextcloud/pure/16/Makefile

@@ -9,7 +9,7 @@ app:
 
 build:
 	make pip
-	python3 kaniko-build.py --version
+	kaniko-wrapper --version
 
 dry:
 	make dry-run
@@ -18,7 +18,7 @@ test:
 	make dry-run
 
 dry-run:
-	python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 pip:
 	rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
@@ -37,7 +37,7 @@ build-compose:
 
 deploy:
 	make pip
-	python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
 
 deploy-compose:
 	docker-compose push

linux/advanced/nextcloud/pure/16/kaniko-build.py

@@ -1,196 +0,0 @@
-import os
-import shutil
-import argparse
-import yaml
-import subprocess
-from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dotenv import load_dotenv
-import logging
-import sys
-
-# Script version
-SCRIPT_VERSION = "1.0.1.0"
-
-# ASCII art for EpicMorg
-ASCII_ART = r"""
-+=================================================+
-| ____|        _)         \  |                    |
-| __|    __ \   |   __|  |\/ |   _ \    __|  _` | |
-| |      |   |  |  (     |   |  (   |  |    (   | |
-|_____|  .__/  _| \___| _|  _| \___/  _|   \__, | |
-| |  /  _|           _)  |                 |___/  |
-| ' /    _` |  __ \   |  |  /   _ \               |
-| . \   (   |  |   |  |    <   (   |              |
-|_|\_\ \__,_| _|  _| _| _|\_\ \___/               |
-|\ \        /                                     |
-| \ \  \   /   __|  _` |  __ \   __ \    _ \   __||
-|  \ \  \ /   |    (   |  |   |  |   |   __/  |   |
-|   \_/\_/   _|   \__,_|  .__/   .__/  \___| _|   |
-|                        _|     _|                |
-+=================================================+
-"""
-
-# Load environment variables from .env file
-load_dotenv()
-
-def setup_logging():
-    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
-
-def parse_args():
-    parser = argparse.ArgumentParser(description="EpicMorg: Kaniko-Compose Wrapper", add_help=False)
-    parser.add_argument('--compose-file', default=os.getenv('COMPOSE_FILE', 'docker-compose.yml'), help='Path to docker-compose.yml file')
-    parser.add_argument('--kaniko-image', default=os.getenv('KANIKO_IMAGE', 'gcr.io/kaniko-project/executor:latest'), help='Kaniko executor image')
-    parser.add_argument('--push', '--deploy', '-d', '-p', action='store_true', help='Deploy the built images to the registry')
-    parser.add_argument('--dry-run', '--dry', action='store_true', help='Dry run: build images without pushing and with cleanup')
-    parser.add_argument('--version', '-v', action='store_true', help='Show script version')
-    parser.add_argument('--help', '-h', action='store_true', help='Show this help message and exit')
-    return parser.parse_args()
-
-def load_compose_file(file_path):
-    with open(file_path, 'r') as file:
-        return yaml.safe_load(file)
-
-def build_with_kaniko(service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry):
-    kaniko_command = [
-        'docker', 'run',
-        '--rm',
-        '-t',
-        '-v', f'{os.path.abspath(build_context)}:/workspace',
-    ]
-
-    # Add Docker config mounts for both read-only access
-    kaniko_command.extend([
-        '-v', '/var/run/docker.sock:/var/run/docker.sock:ro',  # Access to Docker daemon
-        '-v', f'{os.path.expanduser("~")}/.docker:/kaniko/.docker:ro',  # Use existing Docker credentials in read-only mode
-    ])
-
-    kaniko_command.extend([
-        kaniko_image,
-        '--context', '/workspace',
-        '--dockerfile', f'/workspace/{dockerfile}',
-        '--compressed-caching',
-        '--single-snapshot',
-        '--cleanup'
-    ])
-
-    if deploy:
-        kaniko_command.extend([
-            '--destination', image_name
-        ])
-    elif dry:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    else:
-        kaniko_command.extend([
-            '--no-push'
-        ])
-    
-    # Add build arguments if they exist
-    for arg_name, arg_value in build_args.items():
-        kaniko_command.extend(['--build-arg', f'{arg_name}={arg_value}'])
-    
-    logging.info(f"Building {service_name} with Kaniko: {' '.join(kaniko_command)}")
-    
-    process = subprocess.Popen(kaniko_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    
-    # Stream output in real-time
-    for line in process.stdout:
-        logging.info(line.strip())
-    
-    process.wait()
-    
-    if process.returncode == 0:
-        logging.info(f"Successfully built {service_name}")
-    else:
-        for line in process.stderr:
-            logging.error(line.strip())
-        logging.error(f"Error building {service_name}")
-        raise Exception(f"Failed to build {service_name}")
-
-def show_help():
-    print(ASCII_ART)
-    print("EpicMorg: Kaniko-Compose Wrapper\n")
-    print("Arguments:")
-    print("--compose-file        Path to docker-compose.yml file")
-    print("--kaniko-image        Kaniko executor image")
-    print("--push, --deploy, -d, -p    Deploy the built images to the registry")
-    print("--dry-run, --dry      Dry run: build images without pushing and with cleanup")
-    print("--version, -v         Show script version")
-    print("--help, -h            Show this help message and exit")
-
-def show_version():
-    print(ASCII_ART)
-    print(f"EpicMorg: Kaniko-Compose Wrapper {SCRIPT_VERSION}, Python: {sys.version}")
-
-def main():
-    setup_logging()
-    
-    args = parse_args()
-
-    # Show help and exit if --help is provided
-    if args.help:
-        show_help()
-        return
-    
-    # Show version and exit if --version or no relevant arguments are provided
-    if args.version or not (args.push or args.dry_run or args.compose_file != 'docker-compose.yml' or args.kaniko_image != 'gcr.io/kaniko-project/executor:latest'):
-        show_version()
-        return
-    
-    compose_file = args.compose_file
-    kaniko_image = args.kaniko_image
-    deploy = args.push
-    dry = args.dry_run
-    
-    if not os.path.exists(compose_file):
-        logging.error(f"{compose_file} not found")
-        return
-    
-    compose_data = load_compose_file(compose_file)
-    
-    services = compose_data.get('services', {})
-    image_names = defaultdict(int)
-    
-    for service_name, service_data in services.items():
-        image_name = service_data.get('image')
-        
-        if not image_name:
-            logging.warning(f"No image specified for service {service_name}")
-            continue
-        
-        image_names[image_name] += 1
-    
-    for image_name, count in image_names.items():
-        if count > 1:
-            logging.error(f"Error: Image name {image_name} is used {count} times.")
-            return
-    
-    try:
-        with ThreadPoolExecutor() as executor:
-            futures = []
-            for service_name, service_data in services.items():
-                build_data = service_data.get('build', {})
-                build_context = build_data.get('context', '.')
-                dockerfile = build_data.get('dockerfile', 'Dockerfile')
-                image_name = service_data.get('image')
-                build_args = build_data.get('args', {})
-                
-                # Substitute environment variables with their values if they exist
-                build_args = {key: os.getenv(key, value) for key, value in build_args.items()}
-                
-                if not image_name:
-                    logging.warning(f"No image specified for service {service_name}")
-                    continue
-                
-                futures.append(executor.submit(build_with_kaniko, service_name, build_context, dockerfile, image_name, build_args, kaniko_image, deploy, dry))
-            
-            for future in as_completed(futures):
-                future.result()
-    except Exception as exc:
-        logging.error(f"Build failed: {exc}")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()