Skip to content

Commit 40b3435

Browse files
committed
fix dind
1 parent 91c82d8 commit 40b3435

4 files changed

Lines changed: 117 additions & 144 deletions

File tree

gitbug-java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class GitBugJavaCli(object):
2626
def __init__(self, verbose: bool = False):
2727
self.__init_logging(verbose)
2828
self.__projects = {}
29-
self.__gitbugactions_base_image = "ghcr.io/catthehacker/ubuntu:runner-latest"
29+
self.__gitbugactions_base_image = "andre15silva/gitbug-actions:act-latest"
3030
self.__gitbugjava_base_image = "gitbug-java:base-act-latest"
3131

3232
# Load the GitBug-Java dataset
@@ -56,13 +56,14 @@ class GitBugJavaCli(object):
5656
tmp_dir = tempfile.mkdtemp()
5757
Path(tmp_dir).mkdir(parents=True, exist_ok=True)
5858
dockerfile_path = Path(tmp_dir, "Dockerfile")
59+
# FIXME: This should be done once, and the image pulled if needed
5960
with dockerfile_path.open("w") as f:
6061
dockerfile = f"FROM {self.__gitbugactions_base_image}\n"
6162
# HACK: We set runneradmin to an arbitrarily large uid to avoid conflicts with the host's
62-
dockerfile += f"RUN sudo usermod -u 4000000 runneradmin\n"
63-
dockerfile += f"RUN sudo groupadd -o -g {os.getgid()} {grp.getgrgid(os.getgid()).gr_name}\n"
64-
dockerfile += f"RUN sudo usermod -G {os.getgid()} runner\n"
65-
dockerfile += f"RUN sudo usermod -o -u {os.getuid()} runner\n"
63+
# dockerfile += f"RUN sudo usermod -u 4000000 runneradmin\n"
64+
# dockerfile += f"RUN sudo groupadd -o -g {os.getgid()} {grp.getgrgid(os.getgid()).gr_name}\n"
65+
# dockerfile += f"RUN sudo usermod -G {os.getgid()} runner\n"
66+
# dockerfile += f"RUN sudo usermod -o -u {os.getuid()} runner\n"
6667
dockerfile += f"RUN sudo apt update\n"
6768
dockerfile += f"RUN sudo apt install maven -y\n"
6869
f.write(dockerfile)

gitbug/bug.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def run(
192192
logging.debug(f"Executing GitHub Actions for {self.bid}")
193193
shutil.rmtree(Path(workdir, ".act-result"), ignore_errors=True)
194194
runs = executor.run_tests(
195-
keep_containers=False, offline=True, timeout=timeout
195+
keep_containers=False, offline=False, timeout=timeout
196196
)
197197
docker_client.images.remove(runner_image, force=True)
198198
finally:

0 commit comments

Comments
 (0)