X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fbuild-tools.git;a=blobdiff_plain;f=build_step_golden_image.sh;h=77316ff7858ec55803042dc849537e3bbf862539;hp=2dc1a37a1b32e7a7fecf3c3d0a1f0083f9ce3886;hb=HEAD;hpb=4ded4f2a805e9447be90751d7d4fb7e11552e545

diff --git a/build_step_golden_image.sh b/build_step_golden_image.sh
index 2dc1a37..77316ff 100755
--- a/build_step_golden_image.sh
+++ b/build_step_golden_image.sh
@@ -19,26 +19,29 @@ set -e
 scriptdir="$(dirname $(readlink -f ${BASH_SOURCE[0]}))"
 source $scriptdir/lib.sh
 
-output_image_path="$1"
-[[ $output_image_path =~ ^/ ]] || output_image_path=$(pwd)/$output_image_path
-rpm_info_output_dir=$2
-[[ $rpm_info_output_dir =~ ^/ ]] || rpm_info_output_dir=$(pwd)/$rpm_info_output_dir
+output_image_path=${1:-$WORKTMP/goldenimage/$GOLDEN_IMAGE_NAME}
 
-docker_dib_image=dib:2.0
+docker_dib_image=dib
 _load_docker_image $docker_dib_image
 
 docker run \
+  --network=host \
   --rm \
   --privileged \
   -v /dev:/dev \
   -v $WORK:/work \
+  -e WORK=/work \
+  -v $MANIFEST_PATH:/manifest \
+  -e MANIFEST_PATH=/manifest \
+  -v $scriptdir:/tools \
   $docker_dib_image \
-  $(realpath --relative-to $WORK $scriptdir)/create_golden_image.sh
+  /tools/create_golden_image.sh
 
-_publish_image ${TMP_GOLDEN_IMAGE}.qcow2 $output_image_path/${GOLDEN_IMAGE_NAME}
+mkdir -p $(dirname $output_image_path)
+mv -f ${TMP_GOLDEN_IMAGE}.qcow2 $output_image_path
 
 input_dir=$WORKTMP/rpmdata
-mkdir $input_dir
+mkdir -p $input_dir
 cp -r \
   $BUILD_CONFIG_INI $RPMLISTS/rpm_info_installed $RPMLISTS/yum_info_installed $RPMLISTS/crypto_rpms.json $RPMLISTS/boms \
   $input_dir