YunoHost/lxd_img_builder
1
0
Fork 0
mirror of https://github.com/YunoHost/lxd_img_builder.git synced 2024-09-03 19:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

patch_gitlab_runner hack: bad version copypasta + turns out the deb is debian-agnostic so let's use the same one for bullseye and bookworm

Browse source
This commit is contained in:
Alexandre Aubin 2024-08-07 23:53:30 +02:00
parent 6c21cddff3
commit b350b69a70
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
image_builder
View file

@ -90,11 +90,11 @@ function rebuild_build_and_lint()
$IN_CONTAINER dhclient eth0 $IN_CONTAINER dhclient eth0
# Needed to build and access artefacts on core CI ... # Needed to build and access artefacts on core CI ...
incus file push ./gitlab-runner-$DEBIAN_VERSION-light.deb $CONTAINER/root/ incus file push ./gitlab-runner-light.deb $CONTAINER/root/
$IN_CONTAINER /bin/bash -c "apt-get update" $IN_CONTAINER /bin/bash -c "apt-get update"
$IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl" $IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl"
$IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-$DEBIAN_VERSION-light.deb" $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-light.deb"
$IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-$DEBIAN_VERSION-light.deb" $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-light.deb"
# This is for # This is for
# a) building .debs # a) building .debs
@ -135,11 +135,11 @@ function rebuild()
$IN_CONTAINER dhclient eth0 $IN_CONTAINER dhclient eth0
# Needed to build and access artefacts on core CI ... # Needed to build and access artefacts on core CI ...
incus file push ./gitlab-runner-$DEBIAN_VERSION-light.deb $CONTAINER/root/ incus file push ./gitlab-runner-light.deb $CONTAINER/root/
$IN_CONTAINER /bin/bash -c "apt update" $IN_CONTAINER /bin/bash -c "apt update"
$IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl" $IN_CONTAINER /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install ca-certificates git curl"
$IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-$DEBIAN_VERSION-light.deb" $IN_CONTAINER /bin/bash -c "dpkg -i /root/gitlab-runner-light.deb"
$IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-$DEBIAN_VERSION-light.deb" $IN_CONTAINER /bin/bash -c "rm /root/gitlab-runner-light.deb"
local INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION" local INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION"

10
patch_gitlab_runner
View file

@ -1,10 +1,7 @@
# wget -O gitlab-runner-bookworm.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bookworm/main/g/gitlab-runner/gitlab-runner_15.10.0_amd64.deb # wget -O gitlab-runner.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bookworm/main/g/gitlab-runner/gitlab-runner_17.2.1-1_amd64.deb
# wget -O gitlab-runner-bullseye.deb https://packages.gitlab.com/runner/gitlab-runner/debian/pool/bullseye/main/g/gitlab-runner/gitlab-runner_15.10.0_amd64.deb
for DIST in bullseye bookworm ar x gitlab-runner.deb
do
ar x gitlab-runner-$DIST.deb
bunzip2 data.tar.bz2 bunzip2 data.tar.bz2
tar --delete -f data.tar ./usr/lib tar --delete -f data.tar ./usr/lib
bunzip2 -z data.tar bunzip2 -z data.tar
@ -16,6 +13,5 @@ do
rm md5sums rm md5sums
gzip control.tar gzip control.tar
ar rcv gitlab-runner-$DIST-light.deb debian-binary control.tar.gz data.tar.bz2 ar rcv gitlab-runner-light.deb debian-binary control.tar.gz data.tar.bz2
rm debian-binary control.tar.gz data.tar.bz2 rm debian-binary control.tar.gz data.tar.bz2
done