sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allowing ubuntu element use local image"

Browse Source
This commit is contained in:
Zuul 2021-10-01 15:31:07 +00:00 committed by Gerrit Code Review
commit 175c5c4da6
3 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/elements/ubuntu/README.rst
View File

@ -21,5 +21,11 @@ Overrides:
``(universe|multiverse)`` ``(universe|multiverse)``
* Setting ``DIB_DISTRIBUTION_MIRROR_UBUNTU_INSECURE`` updates apt * Setting ``DIB_DISTRIBUTION_MIRROR_UBUNTU_INSECURE`` updates apt
settings to allow insecure/unuthenticated repositories. settings to allow insecure/unuthenticated repositories.
* Setting ``DIB_OFFLINE`` will prevent to download again the source image
if is already present in to $DIB_IMAGE_CACHE path.
* Setting ``DIB_LOCAL_IMAGE`` in combination with ``DIB_OFFLINE`` to
use a image from a local source (full path and file name) and not
download image from internet. Local source for release Trusty and Xenial
have to be tar.gz format. For other more recent release get the squashfs image.
.. element_deps:: .. element_deps::

1
diskimage_builder/elements/ubuntu/environment.d/99-cloud-init-datasources.bash
View File

@ -2,3 +2,4 @@
# allowing the Ec2 data source from being queried on first boot, unless # allowing the Ec2 data source from being queried on first boot, unless
# specified otherwise. # specified otherwise.
export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"Ec2"} export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"Ec2"}
export DIB_IMAGE_LOCAL_FILE=${DIB_IMAGE_LOCAL_FILE:-}

59
diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
View File

@ -25,36 +25,49 @@ CACHED_FILE_LOCK=$DIB_LOCKFILES/$BASE_IMAGE_FILE.lock
CACHED_SUMS=$DIB_IMAGE_CACHE/SHA256SUMS.ubuntu.$DIB_RELEASE.$ARCH CACHED_SUMS=$DIB_IMAGE_CACHE/SHA256SUMS.ubuntu.$DIB_RELEASE.$ARCH
function get_ubuntu_tarball() { function get_ubuntu_tarball() {
if [ -n "$DIB_OFFLINE" -a -f "$CACHED_FILE" ] ; then if [ -n "$DIB_OFFLINE" -a -z "$DIB_LOCAL_IMAGE" ] ; then
echo "Not checking freshness of cached $CACHED_FILE." if [ -f "$CACHED_FILE" ] ; then
else echo "Not checking freshness of cached $CACHED_FILE."
echo "Fetching Base Image" else
$TMP_HOOKS_PATH/bin/cache-url $SHA256SUMS $CACHED_SUMS echo "Fetching Base Image"
$TMP_HOOKS_PATH/bin/cache-url \ $TMP_HOOKS_PATH/bin/cache-url $SHA256SUMS $CACHED_SUMS
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE $TMP_HOOKS_PATH/bin/cache-url \
pushd $DIB_IMAGE_CACHE $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then pushd $DIB_IMAGE_CACHE
# It is likely that an upstream http(s) proxy has given us a skewed
# result - either a cached SHA file or a cached image. Use cache-busting
# to get (as long as caches are compliant...) fresh files.
# Try the sha256sum first, just in case that is the stale one (avoiding
# downloading the larger image), and then if the sums still fail retry
# the image.
$TMP_HOOKS_PATH/bin/cache-url -f $SHA256SUMS $CACHED_SUMS
if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then
$TMP_HOOKS_PATH/bin/cache-url -f \ # It is likely that an upstream http(s) proxy has given us a skewed
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE # result - either a cached SHA file or a cached image. Use cache-busting
grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - # to get (as long as caches are compliant...) fresh files.
# Try the sha256sum first, just in case that is the stale one (avoiding
# downloading the larger image), and then if the sums still fail retry
# the image.
$TMP_HOOKS_PATH/bin/cache-url -f $SHA256SUMS $CACHED_SUMS
if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then
$TMP_HOOKS_PATH/bin/cache-url -f \
$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check -
fi
fi fi
popd
fi fi
popd elif [ ! -f "$DIB_LOCAL_IMAGE" ] ; then
echo "Unable to find image $DIB_LOCAL_IMAGE locally! Check path and file name to source image"
exit 1
fi fi
# Extract the base image (use --numeric-owner to avoid UID/GID mismatch between # Extract the base image (use --numeric-owner to avoid UID/GID mismatch between
# image tarball and host OS e.g. when building Ubuntu image on an openSUSE host) # image tarball and host OS e.g. when building Ubuntu image on an openSUSE host)
if [ $DIB_RELEASE != "trusty" ] && [ $DIB_RELEASE != "xenial" ]; then if [ "$DIB_RELEASE" != "trusty" ] && [ "$DIB_RELEASE" != "xenial" ] ; then
sudo unsquashfs -f -d $TARGET_ROOT $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE if [ -n "$DIB_LOCAL_IMAGE"] ; then
sudo unsquashfs -f -d $TARGET_ROOT $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE
else
sudo unsquashfs -f -d $TARGET_ROOT $DIB_LOCAL_IMAGE
fi
else else
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE if [ -n "$DIB_LOCAL_IMAGE"] ; then
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_IMAGE_CACHE/$BASE_IMAGE_FILE
else
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DIB_LOCAL_IMAGE
fi
fi fi
} }