mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev_container_util.sh: Use the shflags group instead of the default flag

Browse Source 
The build_image script invokes the create_dev_container function, and
passes the `FLAGS_group` as param. Use the param, to generate the
binhost URL instead of using the DEFAULT_GROUP which stays as developer
always.

Fixes: kinvolk/Flatcar#298
Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
This commit is contained in:
Sayan Chowdhury 2020-12-14 18:54:10 +05:30
parent bed73e2b2c
commit 95f05a9ad6
No known key found for this signature in database
GPG Key ID: B02399319CD05C8B
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_library/dev_container_util.sh
View File

@ -3,10 +3,12 @@
# found in the LICENSE file. # found in the LICENSE file.
get_binhost_url() { get_binhost_url() {
if [ "${DEFAULT_GROUP}" == "developer" ]; then local image_group=$1
echo "https://storage.googleapis.com/flatcar-jenkins/${DEFAULT_GROUP}/boards/${BOARD}/${FLATCAR_VERSION}/$1" local image_path=$2
if [ "${image_group}" == "developer" ]; then
echo "https://storage.googleapis.com/flatcar-jenkins/${image_group}/boards/${BOARD}/${FLATCAR_VERSION}/${image_path}"
else else
echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/$1" echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/${image_path}"
fi fi
} }
@ -33,8 +35,8 @@ PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" PORT_LOGDIR="/var/log/portage"
PORTDIR="/var/lib/portage/portage-stable" PORTDIR="/var/lib/portage/portage-stable"
PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay" PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay"
PORTAGE_BINHOST="$(get_binhost_url 'pkgs') PORTAGE_BINHOST="$(get_binhost_url $2 'pkgs')
$(get_binhost_url 'toolchain')" $(get_binhost_url $2 'toolchain')"
EOF EOF
sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF
@ -90,7 +92,7 @@ create_dev_container() {
insert_licenses "${BUILD_DIR}/${image_licenses}" "${root_fs_dir}" insert_licenses "${BUILD_DIR}/${image_licenses}" "${root_fs_dir}"
# Setup portage for emerge and gmerge # Setup portage for emerge and gmerge
configure_dev_portage "${root_fs_dir}" configure_dev_portage "${root_fs_dir}" "${update_group}"
# Mark the image as a developer image (input to chromeos_startup). # Mark the image as a developer image (input to chromeos_startup).
# TODO(arkaitzr): Remove this file when applications no longer rely on it # TODO(arkaitzr): Remove this file when applications no longer rely on it