@@ -511,8 +511,13 @@ class RpmBuildTarget:

         check_prerequesite["ostree-repo"]=True

         if not check_prerequesite["start-docker"]:

             CheckTools.start_docker()

+        if constants.currentArch == "x86_64":

+            photon_docker_image = "vmware/photon-build:rpm-ostree-3.0"

+        else:

+            photon_docker_image = "vmware/photon-build:rpm-ostree-aarch64-3.0"

         if not os.path.isfile(os.path.join(Build_Config.stagePath, "ostree-repo.tar.gz")):

-            process = subprocess.Popen([curDir + "/support/image-builder/ostree-tools/make-ostree-image.sh", curDir, Build_Config.stagePath])

+            process = subprocess.Popen([curDir + "/support/image-builder/ostree-tools/make-ostree-image.sh", curDir, Build_Config.stagePath,

+                                                                                                                        photon_docker_image])

             retval = process.wait()

             if retval != 0:

@@ -742,6 +747,7 @@ class BuildImage:

         self.rpm_path = constants.rpmPath

         self.srpm_path = constants.sourceRpmPath

         self.pkg_to_rpm_map_file = os.path.join(Build_Config.stagePath, "pkg_info.json")

+        self.photon_docker_image = configdict["photon-build-param"]["photon-docker-image"]

     def set_Iso_Parameters(self, imgName):

         self.generated_data_path = Build_Config.stagePath + "/common/data"

@@ -1045,6 +1051,8 @@ def main():

     if 'DOCKER_ENV' in os.environ:

         Build_Config.setDockerEnv(os.environ['DOCKER_ENV'])

+    if 'PHOTON_DOCKER_IMAGE' in os.environ:

+        configdict['photon-build-param']['photon-docker-image'] = os.environ['PHOTON_DOCKER_IMAGE']

     initialize_constants()

@@ -7,6 +7,7 @@

             "loglevel" : "info",

             "full-package-list-file" : "build_install_options_all.json",

             "pkg-build-options" : "pkg_build_options.json",

+            "photon-docker-image" : "photon:3.0",

             "target": "iso"

     },

     "photon-path" : "",

@@ -66,6 +66,7 @@ class Installer(object):

         'postinstall',

         'postinstallscripts',

         'public_key',

+        'photon_docker_image',

         'search_path',

         'setup_grub_script',

         'shadow_password',

@@ -242,6 +243,10 @@ class Installer(object):

         install_config['install_linux_esx'] = False

+        # Default Photon docker image

+        if 'photon_docker_image' not in install_config:

+            install_config['photon_docker_image'] = "photon:latest"

+

     def _check_install_config(self, install_config):

         """

         Sanity check of install_config before its execution.

@@ -643,7 +648,7 @@ class Installer(object):

             retval = self.cmd.run(['docker', 'run',

                                    '-v', self.rpm_cache_dir+':'+self.rpm_cache_dir,

                                    '-v', self.working_directory+':'+self.working_directory,

-                                   'photon:3.0', '/bin/sh', '-c', tdnf_cmd])

+                                   self.install_config['photon_docker_image'], '/bin/sh', '-c', tdnf_cmd])

             if retval != 0:

                 self.logger.error("Failed to install filesystem rpm")

                 self.exit_gracefully()

@@ -931,7 +936,7 @@ class Installer(object):

                 retval = self.cmd.run(['docker', 'run',

                                    '-v', self.rpm_cache_dir+':'+self.rpm_cache_dir,

                                    '-v', self.working_directory+':'+self.working_directory,

-                                   'photon:3.0', '/bin/sh', '-c', tdnf_cmd])

+                                   self.install_config['photon_docker_image'], '/bin/sh', '-c', tdnf_cmd])

         # 0 : succeed; 137 : package already installed; 65 : package not found in repo.

         if retval != 0 and retval != 137:

@@ -241,4 +241,11 @@ Kickstart config file is a json format with following possible parameters:

 	Acceptable values are: "linux", "linux-esx", "linux-rt", "linux-aws", and "linux-secure"

 	Example: { "linux_flavor": "linux-esx" }

+"photon_docker_image" (optional)

+	Contains the docker image <name:tag>

+	are present in "packages" or "packagelist_file"

+	Acceptable values are: "photon:1.0", "photon:2.0", "photon:3.0", "photon" etc.

+        Default value: "photon:latest"

+	Example: { "photon_docker_image": "photon:3.0" }

+

 For reference, look at "sample_ks.cfg" file

@@ -19,5 +19,6 @@

                     	"echo \"Hello World\" > /etc/postinstall"

                    ],

     "public_key": "<ssh-key-here>",

-    "linux_flavor": "linux"

+    "linux_flavor": "linux",

+    "photon_docker_image": "photon:3.0"

 }

@@ -128,7 +128,8 @@ def createIso(options):

                                   working_directory, options.iso_path,

                                   options.rpm_path, options.package_list_file,

                                   rpm_list, options.stage_path, files_to_copy,

-                                  options.generated_data_path, initrd_pkgs])

+                                  options.generated_data_path, initrd_pkgs,

+                                  options.photon_docker_image])

         if retval:

             raise Exception("Unable to create install ISO")

@@ -228,6 +229,11 @@ def createImage(options):

         os.path.abspath(script_dir),

     ]

+    # if 'photon_docker_image' is defined in config_<img>.json then ignore

+    # commandline param 'PHOTON_DOCKER_IMAGE' and 'config.json' value

+    if 'photon_docker_image' not in install_config:

+        install_config['photon_docker_image'] = options.photon_docker_image

+

     if 'size' in config and 'disks' in config:

         raise Exception("Both 'size' and 'disks' key should not be defined together.Please use 'disks' for defining multidisks only.")

     elif 'size' in config:

@@ -305,6 +311,7 @@ if __name__ == '__main__':

     parser.add_argument("-p", "--package-list-file", dest="package_list_file", default="../../common/data/build_install_options_all.json")

     parser.add_argument("-d", "--pkg-to-rpm-map-file", dest="pkg_to_rpm_map_file", default="../../stage/pkg_info.json")

     parser.add_argument("-z", "--pkg-to-be-copied-conf-file", dest="pkg_to_be_copied_conf_file")

+    parser.add_argument("-q", "--photon-docker-image", dest="photon_docker_image", default="photon:latest")

     options = parser.parse_args()

     if options.config_file and options.config_file != '':

@@ -17,6 +17,8 @@ def createOutputArtifact(raw_image_path, config, src_root, tools_bin_path):

     photon_build_num = os.environ['PHOTON_BUILD_NUM']

     image_name = config.get('image_name', 'photon-' + config['image_type']

                        + '-' + photon_release_ver + '-' + photon_build_num)

+    photon_docker_image = config['installer'].get('photon_docker_image',

+                                                           'photon:latest')

     new_name = []

     if type(raw_image_path) is not list:

         raw_image_path = [raw_image_path]

@@ -53,8 +55,8 @@ def createOutputArtifact(raw_image_path, config, src_root, tools_bin_path):

         cmd  = "tdnf install -y qemu-img > /dev/null 2>&1; qemu-img info -f raw --output json {}"

         if not dockerenv:

-            cmd = "docker run -v {}:/mnt:rw photon:{} /bin/bash -c '" + cmd + "'"

-            cmd = cmd.format(src_root, 3.0, '/mnt/' + relrawpath)

+            cmd = "docker run -v {}:/mnt:rw {} /bin/bash -c '" + cmd + "'"

+            cmd = cmd.format(src_root, photon_docker_image, '/mnt/' + relrawpath)

         else:

             cmd = cmd.format(raw_image[0])

         info_output = Utils.runshellcommand(cmd)

@@ -64,8 +66,8 @@ def createOutputArtifact(raw_image_path, config, src_root, tools_bin_path):

         cmd = "tdnf install -y qemu-img > /dev/null 2>&1; qemu-img resize -f raw {} {}"

         if not dockerenv:

-            cmd = "docker run -v {}:/mnt:rw photon:{} /bin/bash -c '" + cmd + "'"

-            cmd = cmd.format(src_root, 3.0, '/mnt/' + relrawpath, mbroundedsize)

+            cmd = "docker run -v {}:/mnt:rw {} /bin/bash -c '" + cmd + "'"

+            cmd = cmd.format(src_root, photon_docker_image, '/mnt/' + relrawpath, mbroundedsize)

         else:

             cmd = cmd.format(raw_image[0], mbroundedsize)

         Utils.runshellcommand(cmd)

@@ -73,8 +75,8 @@ def createOutputArtifact(raw_image_path, config, src_root, tools_bin_path):

         cmd = "tdnf install -y qemu-img > /dev/null 2>&1; qemu-img convert {} -O " + \

                "vpc -o subformat=fixed,force_size {}"

         if not dockerenv:

-            cmd = "docker run -v {}:/mnt:rw photon:{} /bin/bash -c '" + cmd + "'"

-            cmd = cmd.format(src_root, 3.0, '/mnt/' + relrawpath, '/mnt/'

+            cmd = "docker run -v {}:/mnt:rw {} /bin/bash -c '" + cmd + "'"

+            cmd = cmd.format(src_root, photon_docker_image, '/mnt/' + relrawpath, '/mnt/'

                             + os.path.dirname(relrawpath) + vhdname)

         else:

             cmd = cmd.format(raw_image[0], os.path.dirname(raw_image[0]) + vhdname)

@@ -31,6 +31,7 @@ PHOTON_COMMON_DIR=$(dirname "${PACKAGE_LIST_FILE}")

 PACKAGE_LIST_FILE_BASE_NAME=$(basename "${PACKAGE_LIST_FILE}")

 INITRD=${WORKINGDIR}/photon-chroot

 PACKAGES=$8

+PHOTON_DOCKER_IMAGE=$9

 rm -rf $WORKINGDIR/*

 mkdir -p $INITRD

@@ -62,8 +63,8 @@ rpm --root $INITRD --initdb --dbpath /var/lib/rpm

 TDNF_CMD="tdnf install -y --installroot $INITRD --rpmverbosity 10 -c ${WORKINGDIR}/tdnf.conf -q $PACKAGES"

-# run host's tdnf, if fails - try one from photon:3.0 docker image

-$TDNF_CMD || docker run -v $RPMS_PATH:$RPMS_PATH -v $WORKINGDIR:$WORKINGDIR photon:3.0 $TDNF_CMD

+# run host's tdnf, if fails - try one from photon:latest docker image

+$TDNF_CMD || docker run -v $RPMS_PATH:$RPMS_PATH -v $WORKINGDIR:$WORKINGDIR $PHOTON_DOCKER_IMAGE $TDNF_CMD

 rm -f ${WORKINGDIR}/photon-local.repo ${WORKINGDIR}/tdnf.conf

@@ -11,7 +11,7 @@ fi

 PROGRAM=$0

 SRCROOT=$1

 STAGE_DIR=$2

-DOCK_ARCH=`uname -m`

+PHOTON_DOCKER_IMAGE=$3

 cat > ${SRCROOT}/support/image-builder/ostree-tools/mk-ostree-server.sh << EOF

 #!/bin/bash

@@ -31,13 +31,7 @@ echo "baseurl=file:///RPMS" >> ${SRCROOT}/support/image-builder/ostree-tools/pho

 rm -rf ${STAGE_DIR}/ostree-repo

 mkdir -p ${STAGE_DIR}/ostree-repo

-if [ $DOCK_ARCH == "x86_64" ]

-then

- sudo docker run --privileged -v ${SRCROOT}:/photon -v ${STAGE_DIR}/RPMS:/RPMS -v ${STAGE_DIR}/ostree-repo:/srv/rpm-ostree -w="/photon/support/image-builder/ostree-tools/" vmware/photon-build:rpm-ostree-3.0 ./mk-ostree-server.sh /

-elif [ $DOCK_ARCH == "aarch64" ]

-then

-  sudo docker run --privileged -v ${SRCROOT}:/photon -v ${STAGE_DIR}/RPMS:/RPMS -v ${STAGE_DIR}/ostree-repo:/srv/rpm-ostree -w="/photon/support/image-builder/ostree-tools/" vmware/photon-build:rpm-ostree-aarch64-3.0 ./mk-ostree-server.sh /

-fi

+sudo docker run --privileged -v ${SRCROOT}:/photon -v ${STAGE_DIR}/RPMS:/RPMS -v ${STAGE_DIR}/ostree-repo:/srv/rpm-ostree -w="/photon/support/image-builder/ostree-tools/" ${PHOTON_DOCKER_IMAGE} ./mk-ostree-server.sh /

 REPODIR=${STAGE_DIR}/ostree-repo/repo

 if [ -d "$REPODIR" ]; then