From d94e74ada5900bb0b37170bde4af4883f4cbb2fb Mon Sep 17 00:00:00 2001
From: Jenia Peimer <jpeimer@redhat.com>
Date: Thu, 11 Jul 2024 11:45:44 +0300
Subject: [PATCH 1/2] Add command arguments to the build-and-push-container

---
 README.md                                   | 4 +++-
 example.config.yaml                         | 4 ++--
 webhook_server_container/libs/github_api.py | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f6f0c993..28da05a3 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,9 @@ reviewers:
 - `/retest tox`: run tox
 - `/retest build-container`: run build-container
 - `/retest python-module-install`: run python-module-install command
-- `/build-and-push-container`: build and push container image (tag will be the PR number).
+- `/build-and-push-container`: build and push container image (tag will be the PR number)
+  - You can add extra args to the Docker build command
+    - Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
 - `/assign-reviewers`: assign reviewers based on OWNERS file
 
 ### Supported user labels
diff --git a/example.config.yaml b/example.config.yaml
index 1ec00c0b..72f8c501 100644
--- a/example.config.yaml
+++ b/example.config.yaml
@@ -57,8 +57,8 @@ repositories:
       tag: <image_tag>
       release: true # Push image to registry on new release with release as the tag
       build-args: # build args to send to podman build command
-        - build-arg1=1
-        - build-arg2=2
+        - my-build-arg1=1
+        - my-build-arg2=2
       args: # args to send to podman build command
         - --format docker
 
diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index ff20917b..9abee80c 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -160,6 +160,8 @@ def __init__(self, hook_data: Dict[Any, Any], headers: Headers):
     * Multiple target branches can be cherry-picked, separated by spaces. (`/cherry-pick branch1 branch2`)
     * Cherry-pick will be started when PR is merged
  * To build and push container image command `/build-and-push-container` in the PR (tag will be the PR number).
+    * You can add extra args to the Docker build command
+        * Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
  * To add a label by comment use `/<label name>`, to remove, use `/<label name> cancel`
  * To assign reviewers based on OWNERS file use `/assign-reviewers`
  * To check if PR can be merged use `/check-can-merge`
@@ -1252,7 +1254,7 @@ def user_commands(self, command: str, reviewed_user: str, issue_comment_id: int)
         elif _command == BUILD_AND_PUSH_CONTAINER_STR:
             if self.build_and_push_container:
                 self.create_comment_reaction(issue_comment_id=issue_comment_id, reaction=REACTIONS.ok)
-                self._run_build_container(push=True, set_check=False)
+                self._run_build_container(push=True, set_check=False, command_args=_args)
             else:
                 msg = f"No {BUILD_AND_PUSH_CONTAINER_STR} configured for this repository"
                 error_msg = f"{self.log_prefix} {msg}"
@@ -1541,6 +1543,7 @@ def _run_build_container(
         push: bool = False,
         is_merged: bool = False,
         tag: str = "",
+        command_args: str = "",
     ) -> None:
         if not self.build_and_push_container:
             return
@@ -1565,6 +1568,9 @@ def _run_build_container(
         if self.container_command_args:
             build_cmd = f"{' '.join(self.container_command_args)} {build_cmd}"
 
+        if command_args:
+            build_cmd = f"{command_args} {build_cmd}"
+
         if push:
             repository_creds: str = f"{self.container_repository_username}:{self.container_repository_password}"
             build_cmd += f" && podman push --creds {repository_creds} {_container_repository_and_tag}"

From db62c30dba49c53bc3b17a08adf4831627f8f3ea Mon Sep 17 00:00:00 2001
From: Jenia Peimer <jpeimer@redhat.com>
Date: Thu, 11 Jul 2024 12:08:13 +0300
Subject: [PATCH 2/2] Podman fix

---
 README.md                                   | 2 +-
 webhook_server_container/libs/github_api.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28da05a3..806c2b1d 100644
--- a/README.md
+++ b/README.md
@@ -225,7 +225,7 @@ reviewers:
 - `/retest build-container`: run build-container
 - `/retest python-module-install`: run python-module-install command
 - `/build-and-push-container`: build and push container image (tag will be the PR number)
-  - You can add extra args to the Docker build command
+  - You can add extra args to the Podman build command
     - Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
 - `/assign-reviewers`: assign reviewers based on OWNERS file
 
diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index 9abee80c..2618ea1b 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -160,7 +160,7 @@ def __init__(self, hook_data: Dict[Any, Any], headers: Headers):
     * Multiple target branches can be cherry-picked, separated by spaces. (`/cherry-pick branch1 branch2`)
     * Cherry-pick will be started when PR is merged
  * To build and push container image command `/build-and-push-container` in the PR (tag will be the PR number).
-    * You can add extra args to the Docker build command
+    * You can add extra args to the Podman build command
         * Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
  * To add a label by comment use `/<label name>`, to remove, use `/<label name> cancel`
  * To assign reviewers based on OWNERS file use `/assign-reviewers`