Changes to make double-nested containerization work
This commit is contained in:
parent
00494ee2ed
commit
3060a757bd
@ -4,7 +4,7 @@ FROM ubuntu:22.04
|
||||
RUN ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
|
||||
|
||||
# Install basic tools
|
||||
RUN apt update && apt install -y gpg curl apt-transport-https ca-certificates lsb-release build-essential
|
||||
RUN apt update && apt install -y gpg curl wget apt-transport-https ca-certificates lsb-release build-essential
|
||||
|
||||
# Add Docker repo
|
||||
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
|
||||
@ -16,7 +16,6 @@ ARG NODE_MAJOR=18
|
||||
# See: https://stackoverflow.com/a/77021599/1701505
|
||||
RUN set -uex; \
|
||||
apt-get update; \
|
||||
apt-get install -y ca-certificates curl gnupg; \
|
||||
mkdir -p /etc/apt/keyrings; \
|
||||
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
||||
| gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
|
||||
@ -31,3 +30,23 @@ RUN apt update && apt install -y docker-ce && rm -rf /var/lib/apt/lists/*
|
||||
RUN apt update && apt install -y sudo
|
||||
# Install software-properties-common so we have the add-apt-repository command, used by some actions to add a package repo
|
||||
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
|
||||
|
||||
RUN chmod +x /usr/local/bin/start-docker.sh \
|
||||
/usr/local/bin/entrypoint.sh \
|
||||
/usr/local/bin/modprobe
|
||||
|
||||
ENV DOCKER_HOST "unix:///var/run/dind.sock"
|
||||
|
||||
# This VOLUME directive is required for k3d to work, probably because it needs the directory to exist
|
||||
# the volume does not need to be mounted.
|
||||
VOLUME /var/lib/docker
|
||||
|
||||
ENTRYPOINT ["entrypoint.sh"]
|
||||
CMD ["bash"]
|
||||
|
||||
|
7
act-runner/entrypoint.sh
Normal file
7
act-runner/entrypoint.sh
Normal file
@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Start docker
|
||||
start-docker.sh
|
||||
|
||||
# Execute specified command
|
||||
"$@"
|
24
act-runner/logger.sh
Normal file
24
act-runner/logger.sh
Normal file
@ -0,0 +1,24 @@
|
||||
#!/bin/sh
|
||||
# Logger from this post http://www.cubicrace.com/2016/03/log-tracing-mechnism-for-shell-scripts.html
|
||||
|
||||
function INFO(){
|
||||
local function_name="${FUNCNAME[1]}"
|
||||
local msg="$1"
|
||||
timeAndDate=`date`
|
||||
echo "[$timeAndDate] [INFO] [${0}] $msg"
|
||||
}
|
||||
|
||||
|
||||
function DEBUG(){
|
||||
local function_name="${FUNCNAME[1]}"
|
||||
local msg="$1"
|
||||
timeAndDate=`date`
|
||||
echo "[$timeAndDate] [DEBUG] [${0}] $msg"
|
||||
}
|
||||
|
||||
function ERROR(){
|
||||
local function_name="${FUNCNAME[1]}"
|
||||
local msg="$1"
|
||||
timeAndDate=`date`
|
||||
echo "[$timeAndDate] [ERROR] $msg"
|
||||
}
|
20
act-runner/modprobe
Normal file
20
act-runner/modprobe
Normal file
@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
# "modprobe" without modprobe
|
||||
# https://twitter.com/lucabruno/status/902934379835662336
|
||||
|
||||
# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe
|
||||
|
||||
# Docker often uses "modprobe -va foo bar baz"
|
||||
# so we ignore modules that start with "-"
|
||||
for module; do
|
||||
if [ "${module#-}" = "$module" ]; then
|
||||
ip link show "$module" || true
|
||||
lsmod | grep "$module" || true
|
||||
fi
|
||||
done
|
||||
|
||||
# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort
|
||||
export PATH='/usr/sbin:/usr/bin:/sbin:/bin'
|
||||
exec modprobe "$@"
|
30
act-runner/start-docker.sh
Normal file
30
act-runner/start-docker.sh
Normal file
@ -0,0 +1,30 @@
|
||||
#!/bin/bash
|
||||
source /opt/bash-utils/logger.sh
|
||||
|
||||
function wait_for_process () {
|
||||
local max_time_wait=30
|
||||
local process_name="$1"
|
||||
local waited_sec=0
|
||||
while ! pgrep "$process_name" >/dev/null && ((waited_sec < max_time_wait)); do
|
||||
INFO "Process $process_name is not running yet. Retrying in 1 seconds"
|
||||
INFO "Waited $waited_sec seconds of $max_time_wait seconds"
|
||||
sleep 1
|
||||
((waited_sec=waited_sec+1))
|
||||
if ((waited_sec >= max_time_wait)); then
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
INFO "Starting supervisor"
|
||||
/usr/bin/supervisord -n >> /dev/null 2>&1 &
|
||||
|
||||
INFO "Waiting for docker to be running"
|
||||
wait_for_process dockerd
|
||||
if [ $? -ne 0 ]; then
|
||||
ERROR "dockerd is not running after max time"
|
||||
exit 1
|
||||
else
|
||||
INFO "dockerd is running"
|
||||
fi
|
6
act-runner/supervisor/dockerd.conf
Normal file
6
act-runner/supervisor/dockerd.conf
Normal file
@ -0,0 +1,6 @@
|
||||
[program:dockerd]
|
||||
command=/usr/bin/dockerd -H %(ENV_DOCKER_HOST)s --userland-proxy=false
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stderr_logfile=/var/log/dockerd.err.log
|
||||
stdout_logfile=/var/log/dockerd.out.log
|
Loading…
Reference in New Issue
Block a user