From cc0bcaf6002e0b88ddabd4937374424ef25d5327 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 17 May 2023 16:48:45 +0200 Subject: [PATCH] standardization of container names --- auto_upgrade_container.sh | 6 +-- rebuild_all.sh | 12 +++--- utils.sh | 82 +++++++++++++++++++-------------------- variables.sh | 5 ++- 4 files changed, 53 insertions(+), 52 deletions(-) diff --git a/auto_upgrade_container.sh b/auto_upgrade_container.sh index 1fa4b2b..461a047 100755 --- a/auto_upgrade_container.sh +++ b/auto_upgrade_container.sh @@ -9,7 +9,7 @@ do do for snapshot in "before-install" "after-install" do - update_container "$debian_version" "$ynh_version" "$snapshot" + update_container "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "$ynh_version" "$snapshot" done done done @@ -20,8 +20,8 @@ do do for snapshot in "before-install" "after-install" do - update_container "$debian_version" "$ynh_version" "$snapshot" + update_container "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "$ynh_version" "$snapshot" done - lxc delete -f $(lxc list yunohost-$debian_version-r -c n -f csv) + lxc delete -f $(lxc list $PREFIX_IMAGE_NAME-$debian_version-r -c n -f csv) done done diff --git a/rebuild_all.sh b/rebuild_all.sh index 5c22544..c0f4338 100755 --- a/rebuild_all.sh +++ b/rebuild_all.sh @@ -5,13 +5,13 @@ source $current_dir/utils.sh # Get utils functions. for debian_version in "bullseye" do - rebuild_base_containers $debian_version "stable" "amd64" + rebuild_base_containers "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "stable" "amd64" for ynh_version in "testing" "unstable" do for snapshot in "before-install" "after-install" do - restore_snapshot "yunohost-$debian_version" "stable" "$snapshot" + restore_snapshot "$PREFIX_IMAGE_NAME-$debian_version" "stable" "$snapshot" if [[ "$ynh_version" == "testing" ]] then @@ -21,14 +21,14 @@ do repo_version="testing unstable" fi - lxc exec "yunohost-$debian_version" -- /bin/bash -c "for FILE in \`ls /etc/apt/sources.list /etc/apt/sources.list.d/*\`; + lxc exec "$PREFIX_IMAGE_NAME-$debian_version" -- /bin/bash -c "for FILE in \`ls /etc/apt/sources.list /etc/apt/sources.list.d/*\`; do sed -i 's@^deb http://forge.yunohost.org.*@& $repo_version@' \$FILE done" - create_snapshot "yunohost-$debian_version" "$ynh_version" "$snapshot" + create_snapshot "$PREFIX_IMAGE_NAME-$debian_version" "$ynh_version" "$snapshot" - update_container "$debian_version" "$ynh_version" "$snapshot" + update_container "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "$ynh_version" "$snapshot" done done done @@ -36,6 +36,6 @@ done for debian_version in "bookworm" do - rebuild_base_containers $debian_version "unstable" "amd64" + rebuild_base_containers "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "unstable" "amd64" done diff --git a/utils.sh b/utils.sh index 56fcb8b..1ebcf0d 100755 --- a/utils.sh +++ b/utils.sh @@ -142,90 +142,90 @@ get_dependencies() rebuild_base_containers() { - local debian_version=$1 - local ynh_version=$2 - local arch=$3 - local base_image_to_rebuild="yunohost-$debian_version" + local image_to_rebuild=$1 + local debian_version=$2 + local ynh_version=$3 + local arch=$4 - if lxc info "$base_image_to_rebuild" &>/dev/null + if lxc info "$image_to_rebuild" &>/dev/null then - lxc delete -f "$base_image_to_rebuild" + lxc delete -f "$image_to_rebuild" fi - lxc launch images:debian/$debian_version/$arch "$base_image_to_rebuild" -c security.nesting=true + lxc launch images:debian/$debian_version/$arch "$image_to_rebuild" -c security.nesting=true - wait_container "$base_image_to_rebuild" + wait_container "$image_to_rebuild" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "apt-get update" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes wget curl" + lxc exec "$image_to_rebuild" -- /bin/bash -c "apt-get update" + lxc exec "$image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes wget curl" # Install Git LFS, git comes pre installed with ubuntu image. # Disable this line because we don't need to add a new repo to have git-lfs - #lxc exec "$base_image_to_rebuild" -- /bin/bash -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes git-lfs" + #lxc exec "$image_to_rebuild" -- /bin/bash -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" + lxc exec "$image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes git-lfs" # Install gitlab-runner binary since we need for cache/artifacts. if [[ $debian_version == "bullseye" ]] then - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "wget https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_amd64.deb" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "dpkg -i gitlab-runner_amd64.deb" + lxc exec "$image_to_rebuild" -- /bin/bash -c "wget https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_amd64.deb" + lxc exec "$image_to_rebuild" -- /bin/bash -c "dpkg -i gitlab-runner_amd64.deb" else - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "curl -s https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | os=debian dist=$debian_version bash" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes gitlab-runner" + lxc exec "$image_to_rebuild" -- /bin/bash -c "curl -s https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | os=debian dist=$debian_version bash" + lxc exec "$image_to_rebuild" -- /bin/bash -c "apt-get install --assume-yes gitlab-runner" fi INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$debian_version" # Download the YunoHost install script - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "curl $INSTALL_SCRIPT > install.sh" + lxc exec "$image_to_rebuild" -- /bin/bash -c "curl $INSTALL_SCRIPT > install.sh" # Patch the YunoHost install script - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "sed -i -E 's/(step\s+install_yunohost_packages)/#\1/' install.sh" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "sed -i -E 's/(step\s+restart_services)/#\1/' install.sh" + lxc exec "$image_to_rebuild" -- /bin/bash -c "sed -i -E 's/(step\s+install_yunohost_packages)/#\1/' install.sh" + lxc exec "$image_to_rebuild" -- /bin/bash -c "sed -i -E 's/(step\s+restart_services)/#\1/' install.sh" # Run the YunoHost install script patched - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "cat install.sh | bash -s -- -a -d $ynh_version" + lxc exec "$image_to_rebuild" -- /bin/bash -c "cat install.sh | bash -s -- -a -d $ynh_version" get_dependencies $debian_version # Pre install dependencies - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes install --assume-yes $YUNOHOST_DEPENDENCIES $YUNOHOST_RECOMMENDS $MOULINETTE_DEPENDENCIES $SSOWAT_DEPENDENCIES $BUILD_DEPENDENCIES" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "python3 -m pip install -U $PIP3_PKG" + lxc exec "$image_to_rebuild" -- /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes install --assume-yes $YUNOHOST_DEPENDENCIES $YUNOHOST_RECOMMENDS $MOULINETTE_DEPENDENCIES $SSOWAT_DEPENDENCIES $BUILD_DEPENDENCIES" + lxc exec "$image_to_rebuild" -- /bin/bash -c "python3 -m pip install -U $PIP3_PKG" # Disable apt-daily - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily.timer" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily-upgrade.timer" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily.service" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily-upgrade.service" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily.timer" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily-upgrade.timer" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily.service" - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily-upgrade.service" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily.timer" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily-upgrade.timer" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily.service" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q stop apt-daily-upgrade.service" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily.timer" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily-upgrade.timer" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily.service" + lxc exec "$image_to_rebuild" -- /bin/bash -c "systemctl -q disable apt-daily-upgrade.service" mkdir -p $current_dir/cache chmod 777 $current_dir/cache - lxc config device add "$base_image_to_rebuild" cache-folder disk path=/cache source="$current_dir/cache" + lxc config device add "$image_to_rebuild" cache-folder disk path=/cache source="$current_dir/cache" # Unset the mac address to ensure the copy will get a new one and will be able to get new IP - lxc config unset "$base_image_to_rebuild" volatile.eth0.hwaddr + lxc config unset "$image_to_rebuild" volatile.eth0.hwaddr - create_snapshot "$base_image_to_rebuild" "$ynh_version" "before-install" + create_snapshot "$image_to_rebuild" "$ynh_version" "before-install" # Install YunoHost - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "curl $INSTALL_SCRIPT | bash -s -- -a -d $ynh_version" + lxc exec "$image_to_rebuild" -- /bin/bash -c "curl $INSTALL_SCRIPT | bash -s -- -a -d $ynh_version" # Run postinstall - lxc exec "$base_image_to_rebuild" -- /bin/bash -c "yunohost tools postinstall -d domain.tld -u syssa -F 'Syssa Mine' -p the_password --ignore-dyndns --force-diskspace" + lxc exec "$image_to_rebuild" -- /bin/bash -c "yunohost tools postinstall -d domain.tld -u syssa -F 'Syssa Mine' -p the_password --ignore-dyndns --force-diskspace" - create_snapshot "$base_image_to_rebuild" "$ynh_version" "after-install" + create_snapshot "$image_to_rebuild" "$ynh_version" "after-install" - lxc stop "$base_image_to_rebuild" + lxc stop "$image_to_rebuild" } update_container() { - local debian_version=$1 - local ynh_version=$2 - local snapshot=$3 - local image_to_update="yunohost-$debian_version" + local image_to_update=$1 + local debian_version=$2 + local ynh_version=$3 + local snapshot=$4 if ! lxc info "$image_to_update" &>/dev/null then diff --git a/variables.sh b/variables.sh index 1a1efd9..7187d7b 100755 --- a/variables.sh +++ b/variables.sh @@ -27,7 +27,8 @@ fi PROJECT_DIR="$CUSTOM_ENV_CI_PROJECT_DIR" PROJECT_NAME="$CUSTOM_ENV_CI_PROJECT_NAME" -# For example yunohost-buster -BASE_IMAGE="yunohost-$DEBIAN_VERSION" +PREFIX_IMAGE_NAME="ynh" +# For example ynh-buster +BASE_IMAGE="$PREFIX_IMAGE_NAME-$DEBIAN_VERSION" CONTAINER_IMAGE="$BASE_IMAGE-r-$CUSTOM_ENV_CI_RUNNER_ID-p-$CUSTOM_ENV_CI_PROJECT_ID-c-$CUSTOM_ENV_CI_CONCURRENT_PROJECT_ID" \ No newline at end of file