Skip to content

Do not run regctl in container #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myakove merged 4 commits into from
Oct 15, 2024
Merged

Do not run regctl in container #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
012054a
Do not run regctl in container
myakove Oct 15, 2024
8f8ba3a
Do not run regctl in container
myakove Oct 15, 2024
b1f0830
fix /retest all
myakove Oct 15, 2024
9996c3c
we must run in container :)
myakove Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ RUN dnf -y install dnf-plugins-core \
RUN mkdir -p $BIN_DIR \
&& mkdir -p $APP_DIR \
&& mkdir -p $DATA_DIR \
&& mkdir -p $DATA_DIR/logs \
&& mkdir -p /tmp/containers
&& mkdir -p $DATA_DIR/logs

COPY entrypoint.sh pyproject.toml uv.lock README.md $APP_DIR/
COPY webhook_server_container $APP_DIR/webhook_server_container/
Expand Down
2 changes: 0 additions & 2 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

rm -rf /run/containers/storage /run/libpod

SERVER_RUN_CMD="uv run uvicorn webhook_server_container.app:FASTAPI_APP --host 0.0.0.0 --port 5000 "
UVICORN_WORKERS="${UVICORN_MAX_WORKERS:=10}"

Expand Down
6 changes: 3 additions & 3 deletions webhook_server_container/libs/github_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,11 +818,11 @@ def delete_remote_tag_for_merged_or_closed_pr(self) -> None:
return

pr_tag = repository_full_tag.split(":")[-1]
registry_info = self.container_repository.split("/")
registry_url = "" if len(registry_info) < 3 else registry_info[0]
base_regctl_command = (
"podman run --rm --net host -v regctl-conf:/home/appuser/.regctl/ ghcr.io/regclient/regctl:latest"
)
registry_info = self.container_repository.split("/")
registry_url = "" if len(registry_info) < 3 else registry_info[0]

rc, out, err = run_command(
command=f"{base_regctl_command} registry login {registry_url} -u {self.container_repository_username} "
Expand Down Expand Up @@ -1874,7 +1874,7 @@ def process_retest_command(self, issue_comment_id: int, command_args: str) -> No
return

if "all" in command_args:
if len(command_args) > 1:
if len(_target_tests) > 1:
msg = "Invalid command. `all` cannot be used with other tests"
error_msg = f"{self.log_prefix} {msg}."
self.logger.debug(error_msg)
Expand Down