Add dind build

This commit is contained in:
Wojciech Kozlowski 2018-12-18 01:36:08 +00:00
parent 1e269a3f69
commit 75ecac956e
9 changed files with 36 additions and 227 deletions

View File

@ -3,7 +3,7 @@ variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
services:
- docker:dind
- registry.wojciechkozlowski.eu/wojtek/loki/dind:latest
before_script:
- apk add make
@ -33,3 +33,8 @@ nextcloud:
extends: .builds
script:
- make nextcloud
dind:
extends: .builds
script:
- make dind

View File

@ -84,6 +84,26 @@ nextcloud-pull:
nextcloud: nextcloud-clean nextcloud-build nextcloud-push
# -----------------------------------------------------------------------------
# dind
# -----------------------------------------------------------------------------
DIND = $(DOCKER_REGISTRY)/dind
dind-clean:
docker rmi $(DIND) || /bin/true
dind-build:
docker build -f dind/Dockerfile -t $(DIND) ./dind
dind-push:
docker push $(DIND)
dind-pull:
docker pull $(DIND)
dind: dind-clean dind-build dind-push
# -----------------------------------------------------------------------------
# Collect targets.
# -----------------------------------------------------------------------------
@ -95,22 +115,26 @@ clean-all:
clean-builds: \
proxy-clean \
wiki-clean \
nextcloud-clean
nextcloud-clean \
dind-clean
build-all: \
proxy-build \
wiki-build \
nextcloud-build
nextcloud-build \
dind-build
push-all: \
proxy-push \
wiki-push \
nextcloud-push
nextcloud-push \
dind-push
pull-all: \
proxy-pull \
wiki-pull \
nextcloud-pull
nextcloud-pull \
dind-pull
# -----------------------------------------------------------------------------
# Clean - build - push

2
dind/Dockerfile Normal file
View File

@ -0,0 +1,2 @@
FROM docker:dind
COPY hosts /etc/hosts

View File

@ -1,18 +0,0 @@
FROM debian:stable-slim
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get -y upgrade
# Add files to setup GitLab repo
COPY script.deb.sh /tmp/script.deb.sh
COPY pin-gitlab-runner.pref /etc/apt/preferences.d/pin-gitlab-runner.pref
# Install gitlab-runner
RUN apt-get -y install gnupg2 && bash /tmp/script.deb.sh && apt-get -y install gitlab-runner
# Preserve runner's data
VOLUME ["/etc/gitlab-runner", "/home/gitlab-runner"]
# init sets up the environment and launches gitlab-runner
CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"]
ENTRYPOINT ["/usr/bin/gitlab-runner"]

View File

@ -1,19 +0,0 @@
FROM registry.wojciechkozlowski.eu/wojtek/loki/runner-base
RUN apt-get -y install \
apt-transport-https \
ca-certificates \
curl \
gnupg2 \
software-properties-common
RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add -
RUN add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
$(lsb_release -cs) \
stable"
RUN apt-get update && apt-get -y install docker-ce docker-compose
ENV DOCKER_HOST "tcp://docker:2375"

View File

@ -1,8 +0,0 @@
FROM registry.wojciechkozlowski.eu/wojtek/loki/runner-base
RUN apt-get -y install \
build-essential \
python3 \
python3-pip
RUN pip3 install pycodestyle coverage

View File

@ -1,4 +0,0 @@
Explanation: Prefer GitLab provided packages over the Debian native ones
Package: gitlab-runner
Pin: origin packages.gitlab.com
Pin-Priority: 1001

View File

@ -1,173 +0,0 @@
#!/bin/bash
unknown_os ()
{
echo "Unfortunately, your operating system distribution and version are not supported by this script."
echo
echo "You can override the OS detection by setting os= and dist= prior to running this script."
echo "You can find a list of supported OSes and distributions on our website: https://packages.gitlab.com/docs#os_distro_version"
echo
echo "For example, to force Ubuntu Trusty: os=ubuntu dist=trusty ./script.sh"
echo
echo "Please email support@packagecloud.io and let us know if you run into any issues."
exit 1
}
curl_check ()
{
echo "Checking for curl..."
if command -v curl > /dev/null; then
echo "Detected curl..."
else
echo "Installing curl..."
apt-get install -q -y curl
fi
}
install_debian_keyring ()
{
if [ "${os}" = "debian" ]; then
echo "Installing debian-archive-keyring which is needed for installing "
echo "apt-transport-https on many Debian systems."
apt-get install -y debian-archive-keyring &> /dev/null
fi
}
detect_os ()
{
if [[ ( -z "${os}" ) && ( -z "${dist}" ) ]]; then
# some systems dont have lsb-release yet have the lsb_release binary and
# vice-versa
if [ -e /etc/lsb-release ]; then
. /etc/lsb-release
if [ "${ID}" = "raspbian" ]; then
os=${ID}
dist=`cut --delimiter='.' -f1 /etc/debian_version`
else
os=${DISTRIB_ID}
dist=${DISTRIB_CODENAME}
if [ -z "$dist" ]; then
dist=${DISTRIB_RELEASE}
fi
fi
elif [ `which lsb_release 2>/dev/null` ]; then
dist=`lsb_release -c | cut -f2`
os=`lsb_release -i | cut -f2 | awk '{ print tolower($1) }'`
elif [ -e /etc/debian_version ]; then
# some Debians have jessie/sid in their /etc/debian_version
# while others have '6.0.7'
os=`cat /etc/issue | head -1 | awk '{ print tolower($1) }'`
if grep -q '/' /etc/debian_version; then
dist=`cut --delimiter='/' -f1 /etc/debian_version`
else
dist=`cut --delimiter='.' -f1 /etc/debian_version`
fi
else
unknown_os
fi
fi
if [ -z "$dist" ]; then
unknown_os
fi
# remove whitespace from OS and dist name
os="${os// /}"
dist="${dist// /}"
echo "Detected operating system as $os/$dist."
}
main ()
{
detect_os
curl_check
# Need to first run apt-get update so that apt-transport-https can be
# installed
echo -n "Running apt-get update... "
apt-get update &> /dev/null
echo "done."
# Install the debian-archive-keyring package on debian systems so that
# apt-transport-https can be installed next
install_debian_keyring
echo -n "Installing apt-transport-https... "
apt-get install -y apt-transport-https &> /dev/null
echo "done."
gpg_key_url="https://packages.gitlab.com/runner/gitlab-runner/gpgkey"
apt_config_url="https://packages.gitlab.com/install/repositories/runner/gitlab-runner/config_file.list?os=${os}&dist=${dist}&source=script"
apt_source_path="/etc/apt/sources.list.d/runner_gitlab-runner.list"
echo -n "Installing $apt_source_path..."
# create an apt config file for this repository
curl -sSf "${apt_config_url}" > $apt_source_path
curl_exit_code=$?
if [ "$curl_exit_code" = "22" ]; then
echo
echo
echo -n "Unable to download repo config from: "
echo "${apt_config_url}"
echo
echo "This usually happens if your operating system is not supported by "
echo "packagecloud.io, or this script's OS detection failed."
echo
echo "You can override the OS detection by setting os= and dist= prior to running this script."
echo "You can find a list of supported OSes and distributions on our website: https://packages.gitlab.com/docs#os_distro_version"
echo
echo "For example, to force Ubuntu Trusty: os=ubuntu dist=trusty ./script.sh"
echo
echo "If you are running a supported OS, please email support@packagecloud.io and report this."
[ -e $apt_source_path ] && rm $apt_source_path
exit 1
elif [ "$curl_exit_code" = "35" -o "$curl_exit_code" = "60" ]; then
echo "curl is unable to connect to packagecloud.io over TLS when running: "
echo " curl ${apt_config_url}"
echo "This is usually due to one of two things:"
echo
echo " 1.) Missing CA root certificates (make sure the ca-certificates package is installed)"
echo " 2.) An old version of libssl. Try upgrading libssl on your system to a more recent version"
echo
echo "Contact support@packagecloud.io with information about your system for help."
[ -e $apt_source_path ] && rm $apt_source_path
exit 1
elif [ "$curl_exit_code" -gt "0" ]; then
echo
echo "Unable to run: "
echo " curl ${apt_config_url}"
echo
echo "Double check your curl installation and try again."
[ -e $apt_source_path ] && rm $apt_source_path
exit 1
else
echo "done."
fi
echo -n "Importing packagecloud gpg key... "
# import the gpg key
curl -L "${gpg_key_url}" 2> /dev/null | apt-key add - &>/dev/null
echo "done."
echo -n "Running apt-get update... "
# update apt on this system
apt-get update &> /dev/null
echo "done."
echo
echo "The repository is setup! You can now install packages."
}
main