Changes to make double-nested containerization work #74

Merged
dboreham merged 4 commits from dboreham/fix-dind into main 2024-01-11 14:17:12 +00:00
7 changed files with 5 additions and 3 deletions
Showing only changes of commit cefd19456f - Show all commits

View File

@ -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"]

0
act-runner/entrypoint.sh Normal file → Executable file
View File

0
act-runner/logger.sh Normal file → Executable file
View File

0
act-runner/modprobe Normal file → Executable file
View File

View File

@ -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)

0
act-runner/start-docker.sh Normal file → Executable file
View File

View File

@ -1,7 +1,7 @@
services:
server:
image: gitea/gitea:1.21
image: cerc/gitea:local
environment:
- USER_UID=1000
- USER_GID=1000