Compare commits

..

No commits in common. "master" and "1.0.10" have entirely different histories.

3 changed files with 6 additions and 30 deletions

View File

@ -34,23 +34,9 @@ RUN sudo apt-get update -qq && sudo apt-get install -qqy \
RUN curl -sSL https://get.docker.com/ | sh
# Define additional metadata for our image.
VOLUME /var/lib/docker
#RUN sudo usermod -aG docker docker
RUN sudo usermod -aG docker docker
#Finishing Installing Docker
#Install kubectl
RUN sudo apt-get update && sudo apt-get install
RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
RUN echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list
RUN sudo apt-get update
RUN sudo apt-get install -y kubectl
#Finishing Instaling kubectl
#Install Docker Compose
RUN sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
RUN sudo chmod +x /usr/local/bin/docker-compose
RUN docker-compose --version
#Finishing Installing Docker Compose
# install python and the packages the your code depends on along with jq so we can parse JSON
# add additional packages as necessary
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@ -70,14 +56,14 @@ COPY start.sh start.sh
# make the script executable
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.
ADD ./wrapdocker.sh /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
# 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
ENTRYPOINT ["./start.sh"]

View File

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

View File

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