3 Commits

3 changed files with 14 additions and 6 deletions

View File

@ -34,7 +34,7 @@ RUN sudo apt-get update -qq && sudo apt-get install -qqy \
RUN curl -sSL https://get.docker.com/ | sh RUN curl -sSL https://get.docker.com/ | sh
# Define additional metadata for our image. # Define additional metadata for our image.
VOLUME /var/lib/docker VOLUME /var/lib/docker
RUN sudo usermod -aG docker docker #RUN sudo usermod -aG docker docker
#Finishing Installing Docker #Finishing Installing Docker
# install python and the packages the your code depends on along with jq so we can parse JSON # install python and the packages the your code depends on along with jq so we can parse JSON
@ -56,14 +56,14 @@ COPY start.sh start.sh
# make the script executable # make the script executable
RUN chmod +x start.sh RUN chmod +x start.sh
# since the config and run script for actions are not allowed to be run by root,
# set the user to "docker" so all subsequent commands are run as the docker user
USER docker
# Install the magic wrapper. # Install the magic wrapper.
ADD ./wrapdocker.sh /usr/local/bin/wrapdocker.sh ADD ./wrapdocker.sh /usr/local/bin/wrapdocker.sh
RUN sudo chmod +x /usr/local/bin/wrapdocker.sh RUN sudo chmod +x /usr/local/bin/wrapdocker.sh
RUN sudo sed -i "2 i\exec sudo /usr/local/bin/wrapdocker.sh &" start.sh RUN sudo sed -i "2 i\exec sudo /usr/local/bin/wrapdocker.sh &" start.sh
# since the config and run script for actions are not allowed to be run by root,
# set the user to "docker" so all subsequent commands are run as the docker user
USER docker
# set the entrypoint to the start.sh script # set the entrypoint to the start.sh script
ENTRYPOINT ["./start.sh"] ENTRYPOINT ["./start.sh"]

View File

@ -1,3 +1,3 @@
# Docker Github Action Runner # Docker Github Action Runner
## Version 1.0.10 ## Version 1.0.13

View File

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ -z "${HOME_USER}" ]]; then
HOME_USER="docker"
fi
# Ensure that all nodes in /dev/mapper correspond to mapped devices currently loaded by the device-mapper kernel driver # Ensure that all nodes in /dev/mapper correspond to mapped devices currently loaded by the device-mapper kernel driver
dmsetup mknodes dmsetup mknodes
@ -108,6 +112,10 @@ else
fi fi
sleep 1 sleep 1
done done
sudo update-alternatives --set iptables /usr/sbin/iptables-legacy
sudo update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
sudo chmod -R a+rwX /var/run/docker.sock
sudo su - ${HOME_USER} -c "sudo usermod -aG docker ${HOME_USER}"
[[ $1 ]] && exec "$@" [[ $1 ]] && exec "$@"
exec bash --login exec bash --login
fi fi