grml-live had >410 commits since v0.47.7 (which we used so far), including getting rid of FAI (through our own so called minifai implementation), supporting mmdebstrap for bootstrapping (and using it by default nowadays), and usage inside non-privileged containers. Misc changes: * No longer run any docker containers with --privileged, now that this is handled all internally from within grml-live's build driver * Upgrade everything to Debian/trixie (given that we also switched our trunk/master branch towards trixie also) * Provide wrapper.sh script to avoid maintaining it also inside jenkins-configs' jobs/internal/grml/build_grml_image.sh (which meant going through yet another layer and every single change to it required a full jenkins-config change). Update README.txt accordingly to provide usage examples. * Set up keyring for custom bootstrapping using our own mirror, using grml_build/config/bootstrap-keyring/SIPWISE and deploying /usr/share/keyrings/sipwise-archive-keyring.gpg via updatebase hook script * Ship .gitignore files to ignore directories that are relevant for the build process, though we also don't need to explicitly create them on every single build any longer. * Update configuration layout for grml-live change as of upstream version v0.51.0 (see grml-live.git commit f1dc42a), moving from /etc/grml/fai/config into /usr/share/grml-live/config. * Update configuration layout for grml-live change as of upstream version 0.53.0 (see grml-live.git commit 3a4bd41), changing schema files/<path>/<CLASS> into files/<CLASS>/<path>, class/<CLASS>.var into env/<CLASS> and hooks/<hookname>.<CLASS> into hooks/<CLASS>/<hookname>. * Add memtest86+ + ipxe to SIPWISE class, so they are available for boot menu integration (grml-live uses addons from grml_chroot and no longer from host system). grml_build/Dockerfile related changes: * Adjust ENV usage (fixes `LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 9)`) * Add snippet for usage with debian:trixie-slim as base docker image (useful for debugging e.g. without access to Sipwise systems) * Install ca-certificates (needed for access to https://github.com/ with debian:trixie-slim) * Switch from grml-live v0.47.7 to v0.53.2 * Drop deprecated dependencies that are no longer relevant with recent grml-live versions (fai-client + fai-server get replaced by our own minifai implementation, mksh is no longer relevant for grml-live, and isolinux, ipxe, memtest86+ + syslinux are used from the grml_chroot instead of from the host system, also see above) * Instead install mmdebstrap (which is much faster for bootstrapping than debootstrap), now being supported and the default, thanks to our minifai implementation * Drop /root/.bash_history, as we switched towards our custom wrapper.sh script t/Dockerfile related changes: * Mark /code as safe directory for git, to not fail with "fatal: detected dubious ownership in repository at '/code'" * Adjust ENV usage (fixes `LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 8)`) Addendum: it's yet unclear why we need the `ulimit -n 1048576` workaround to fix an apt/apt-mark performance issue. It feels similar to what has been observed for fakeroot at https://bugs.debian.org/920913. Credits to Chris Hofstaedtler for review and working on grml-live's minifai, to support all our needs. Change-Id: I85111806a550f1aeffcb5263af2455ec8b90cc32mr13.4
Michael Prokop
6 months ago
parent
9b12000688
commit
8647b3d7b5
@ -0,0 +1 @@
|
|||||||
|
*
|
||||||
@ -0,0 +1 @@
|
|||||||
|
*
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eux
|
||||||
|
|
||||||
|
# shellcheck disable=SC2154
|
||||||
|
echo "Deploying /usr/share/keyrings/sipwise-archive-keyring.gpg to ${target}/etc/apt/trusted.gpg.d/"
|
||||||
|
cp /usr/share/keyrings/sipwise-archive-keyring.gpg "${target}"/etc/apt/trusted.gpg.d/
|
||||||
@ -0,0 +1,109 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
# sanity checks
|
||||||
|
if [ -z "${osversion:-}" ]; then
|
||||||
|
echo "Error: osversion is unset, please set to supported Debian/release (like 'trixie' or 'auto')" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${release:-}" ]; then
|
||||||
|
echo "Error: release is unset, please set to supported Sipwise release (like 'mr13.5.1' or 'trunk')" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [ -d grml_build ] ; then
|
||||||
|
echo "Error: grml_build doesn't exist, executing outside deployment-iso directory?" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ensure that we're running it manually inside deployment-iso,
|
||||||
|
# or we're running it from within Jenkins
|
||||||
|
if [ "$(basename "$(pwd)")" = "deployment-iso" ] ; then
|
||||||
|
echo "*** Looks we're running locally inside deployment-iso directory ***"
|
||||||
|
elif [ -n "${WORKSPACE:-}" ] && [ "$(basename "$(pwd)")" = "source" ] ; then
|
||||||
|
echo "*** Looks we're running inside Jenkins ***"
|
||||||
|
else
|
||||||
|
echo "Error: you need to run this inside the deployment-iso directory or from within Jenkins" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# derive Debian release from grml_build/Dockerfile if osversion is set to "auto"
|
||||||
|
if [[ "${osversion}" == 'auto' ]]; then
|
||||||
|
osversion="$( sed -rn 's|^FROM docker.mgm.sipwise.com/sipwise-([A-Za-z0-9]+):.+$|\1|p' grml_build/Dockerfile )"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${WORKSPACE:-}" ] ; then
|
||||||
|
docker_image="grml-sipwise"
|
||||||
|
echo "*** Assuming local build with docker image '${docker_image}' ***"
|
||||||
|
else
|
||||||
|
echo "*** Looks like we are running inside Jenkins environment ***"
|
||||||
|
docker_repo=${docker_repo:-docker.mgm.sipwise.com}
|
||||||
|
docker_repo_port=${docker_repo_port:-5000}
|
||||||
|
docker_name="grml-build-${osversion}"
|
||||||
|
docker_tag="${dockertag:-latest}" # support custom build param via grml-build-iso Jenkins job
|
||||||
|
docker_image="${docker_repo}:${docker_repo_port}/${docker_name}:${docker_tag}"
|
||||||
|
echo "*** Pulling ${docker_image} docker image ***"
|
||||||
|
docker pull "${docker_image}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${osversion:-}" ]; then
|
||||||
|
echo "Can not detect osversion, exiting" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# misc variables
|
||||||
|
fai_config='/code/grml-live/config/'
|
||||||
|
outside_fai_config="${PWD}/grml_build/config/"
|
||||||
|
debian_bootstrap_url="https://debian.sipwise.com/debian/"
|
||||||
|
iso_image_name="grml-sipwise-${osversion}-$(date +%Y%m%d_%H%M%S).iso"
|
||||||
|
|
||||||
|
# write apt sources
|
||||||
|
source_list_path='etc/apt/sources.list.d/sipwise.list'
|
||||||
|
repo_addr="deb https://deb.sipwise.com/autobuild release-trunk-${osversion} main"
|
||||||
|
if [[ "${release}" != 'trunk' ]]; then
|
||||||
|
repo_addr="deb https://deb.sipwise.com/spce/${release} ${osversion} main"
|
||||||
|
fi
|
||||||
|
echo "${repo_addr}" > "${outside_fai_config}files/SIPWISE/${source_list_path}"
|
||||||
|
|
||||||
|
# get the puppet public key, so no need to download it in deployment.sh
|
||||||
|
puppet_key='puppet.gpg'
|
||||||
|
wget -O "${outside_fai_config}/files/PUPPETLABS/root/${puppet_key}" http://apt.puppetlabs.com/DEB-GPG-KEY-puppetlabs
|
||||||
|
|
||||||
|
build_command=''
|
||||||
|
build_command+=" cp -rv /grml/config/ /code/grml-live/"
|
||||||
|
build_command+=" && ulimit -n 1048576" # workaround to fix apt/apt-mark performance issue
|
||||||
|
build_command+=" && GRML_NAME=grml64-small"
|
||||||
|
build_command+=" CHROOT_OUTPUT=/root/grml_chroot"
|
||||||
|
build_command+=" FAI_DEBOOTSTRAP='${osversion} ${debian_bootstrap_url}'"
|
||||||
|
build_command+=" LIVE_CONF=/code/grml-live/etc/grml/grml-live.conf"
|
||||||
|
build_command+=" GRML_FAI_CONFIG=${fai_config}"
|
||||||
|
build_command+=" ./grml-live"
|
||||||
|
build_command+=" -s '${osversion}'"
|
||||||
|
build_command+=" -a amd64"
|
||||||
|
build_command+=" -i '${iso_image_name}'"
|
||||||
|
build_command+=" -c GRMLBASE,SIPWISE,AMD64,PUPPETLABS"
|
||||||
|
build_command+=" -t /code/grml-live/templates/"
|
||||||
|
build_command+=" -o /grml/"
|
||||||
|
build_command+=" -r 'grml-sipwise-${osversion}'"
|
||||||
|
build_command+=" -v '${release}'"
|
||||||
|
build_command+=" -F"
|
||||||
|
build_command+=" && cd /grml/grml_isos/"
|
||||||
|
build_command+=" && sha1sum '${iso_image_name}' > '${iso_image_name}.sha1'"
|
||||||
|
build_command+=" && md5sum '${iso_image_name}' > '${iso_image_name}.md5'"
|
||||||
|
|
||||||
|
echo "System information:"
|
||||||
|
uname -a
|
||||||
|
lsb_release -a
|
||||||
|
docker --version
|
||||||
|
dpkg -l | grep docker
|
||||||
|
|
||||||
|
echo "Build command is:"
|
||||||
|
echo "${build_command}"
|
||||||
|
|
||||||
|
docker run --rm \
|
||||||
|
-v "$(pwd)":/deployment-iso/ \
|
||||||
|
-v "$(pwd)/grml_build/":/grml/ \
|
||||||
|
"${docker_image}" \
|
||||||
|
/bin/bash -c "${build_command}"
|
||||||
Loading…
Reference in new issue