From cefd19456f36e568bf607a1d398a183229886f52 Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Tue, 9 Jan 2024 14:29:37 -0600
Subject: [PATCH] Minor tweaks.

---
 act-runner/Dockerfile.task-executor | 3 ++-
 act-runner/entrypoint.sh            | 0
 act-runner/logger.sh                | 0
 act-runner/modprobe                 | 0
 act-runner/stack/deploy/commands.py | 3 ++-
 act-runner/start-docker.sh          | 0
 gitea/docker-compose.yml            | 2 +-
 7 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 act-runner/entrypoint.sh
 mode change 100644 => 100755 act-runner/logger.sh
 mode change 100644 => 100755 act-runner/modprobe
 mode change 100644 => 100755 act-runner/start-docker.sh

diff --git a/act-runner/Dockerfile.task-executor b/act-runner/Dockerfile.task-executor
index 4d86e87..889adc3 100644
--- a/act-runner/Dockerfile.task-executor
+++ b/act-runner/Dockerfile.task-executor
@@ -33,6 +33,7 @@ RUN apt update && apt install -y software-properties-common
 
 # Packages and files to support dind functionality see: https://github.com/cruizba/ubuntu-dind
 RUN apt update && apt install -y iptables supervisor
+
 COPY modprobe start-docker.sh entrypoint.sh /usr/local/bin/
 COPY supervisor/ /etc/supervisor/conf.d/
 COPY logger.sh /opt/bash-utils/logger.sh
@@ -47,6 +48,6 @@ ENV DOCKER_HOST "unix:///var/run/dind.sock"
 # the volume does not need to be mounted.
 VOLUME /var/lib/docker
 
-ENTRYPOINT ["entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD ["bash"]
 
diff --git a/act-runner/entrypoint.sh b/act-runner/entrypoint.sh
old mode 100644
new mode 100755
diff --git a/act-runner/logger.sh b/act-runner/logger.sh
old mode 100644
new mode 100755
diff --git a/act-runner/modprobe b/act-runner/modprobe
old mode 100644
new mode 100755
diff --git a/act-runner/stack/deploy/commands.py b/act-runner/stack/deploy/commands.py
index d5e861b..21fa62b 100644
--- a/act-runner/stack/deploy/commands.py
+++ b/act-runner/stack/deploy/commands.py
@@ -21,6 +21,7 @@ def create(context, extra_args):
     # Our goal here is just to copy the config file for act
     deployment_config_dir = context.deployment_dir.joinpath("data",
                                                             "act-runner-config")
-    compose_file = [f for f in context.command_context.cluster_context.compose_files if "act-runner" in f][0]
+    command_context = extra_args[2]
+    compose_file = [f for f in command_context.cluster_context.compose_files if "act-runner" in f][0]
     source_config_file = Path(compose_file).parent.joinpath("config", "act-runner-config.yml")
     copy(source_config_file, deployment_config_dir)
diff --git a/act-runner/start-docker.sh b/act-runner/start-docker.sh
old mode 100644
new mode 100755
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index d19d1b4..c16fa44 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,7 +1,7 @@
 
 services:
   server:
-    image: gitea/gitea:1.21
+    image: cerc/gitea:local
     environment:
       - USER_UID=1000
       - USER_GID=1000