@@ -202,10 +202,10 @@ docker-image:

 		--net=host \

 		-v `pwd`:/workspace \

 		toliaqat/photon-dev \

-		./support/dockerfiles/photon/make-docker-image.sh /workspace

+		./support/dockerfiles/photon/make-docker-image.sh tdnf

 install-docker-image: docker-image

-	sudo docker build -t photon:base .

+	sudo docker build -t photon:tdnf .

 clean: clean-install clean-chroot

 	@echo "Deleting Photon ISO..."

@@ -26,7 +26,7 @@ BuildRequires:	python2

 BuildRequires:	python2-libs

 BuildRequires:	gobject-introspection-devel

 BuildRequires:	gobject-introspection-python

-Requires:	glib-devel

+Requires:	glib

 Requires:	libffi

 Requires:	pcre

 %description

@@ -31,15 +31,13 @@ BuildRequires: 	python2-libs

 BuildRequires:	python2

 BuildRequires: 	gobject-introspection-python

-Requires:      yum

 BuildRequires:	which

 BuildRequires:	popt-devel

 Requires:	libcap

-Requires:	librepo-devel

+Requires:	librepo

 Requires:	hawkey

-Requires:	rpm

-Requires:	libhif-devel

-Requires:	openssl-devel

+Requires:	libhif

+Requires:	openssl

 Requires:	ostree

 Requires:	json-glib

@@ -77,6 +75,8 @@ find %{buildroot} -name '*.la' -delete

 %{_libdir}/*.so.1*

 %{_libdir}/girepository-1.0/*.typelib

+

+

 %files devel

 %{_libdir}/lib*.so

 %{_includedir}/*

@@ -42,7 +42,7 @@ class OstreeInstaller(Installer):

                     "Please provide the URL of OSTree repo",

                     "OSTree Repo URL:", 2,

                     self.install_config,

-                    "http://192.168.29.166/")

+                    "https://dl.bintray.com/vmware/photon/rpms/dev/")

                 ret = ostree_url_reader.get_user_string(None)

                 self.ostree_repo_url = ret.result

@@ -54,7 +54,7 @@ class OstreeInstaller(Installer):

                 "Please provide the Ref in OSTree repo",

                 "OSTree Repo Ref:", 2,

                 self.install_config,

-                "tp2/x86_64/minimal")

+                "dev/x86_64/minimal")

             ret = ostree_ref_reader.get_user_string(None)

             self.ostree_ref = ret.result

@@ -31,6 +31,19 @@ class OstreeServerInstaller(Installer):

     def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

         Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

+    def unsafe_install(self, params):

+        rpmrepo_url_reader = WindowStringReader(

+            self.maxy, self.maxx, 10, 70,

+            "rpm_repo_url", False,

+            "Please provide the URL of RPM repo",

+            "RPM Repo URL:", 2,

+            self.install_config,

+            "https://dl.bintray.com/vmware/photon/rpms/dev/")

+

+        ret = rpmrepo_url_reader.get_user_string(None)

+        self.rpm_repo_url = ret.result

+        return Installer.unsafe_install(self, params)

+

     def finalize_system(self):

         Installer.finalize_system(self)

@@ -39,5 +52,14 @@ class OstreeServerInstaller(Installer):

         self.run("cp ./mk-ostree-server.sh {}/srv/rpm-ostree/".format(self.photon_root))

         self.run("cp ./photon-base.json {}/srv/rpm-ostree/".format(self.photon_root))

         self.run("cp ./photon-ostree.repo {}/srv/rpm-ostree/".format(self.photon_root))

+        with open("{}/srv/rpm-ostree/photon-ostree.repo".format(self.photon_root), "a") as myfile:

+            myfile.write("baseurl={}".format(self.rpm_repo_url))

+

+        self.run("mv {}/etc/resolv.conf {}/etc/resolv.conf.bak".format(self.photon_root, self.photon_root))

+        self.run("cp /etc/resolv.conf {}/etc/resolv.conf".format(self.photon_root, self.photon_root))

+

         self.run("mount /dev/cdrom {}/mnt/cdrom".format(self.photon_root))

         self.run("chroot {} bash -c \"cd /srv/rpm-ostree; ./mk-ostree-server.sh /\"".format(self.photon_root))

+

+        # Restore resolv.conf

+        self.run("mv {}/etc/resolv.conf.bak {}/etc/resolv.conf".format(self.photon_root, self.photon_root))

@@ -1,6 +1,5 @@

 [photon-ostree]

-name=VMware Photon Linux 1.0(x86_64)

-baseurl=http://192.168.29.140:8090/

+name=VMware Photon OSTree Linux 1.0(x86_64)

 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY

 gpgcheck=0

 enabled=1

@@ -81,9 +81,9 @@ class ReadText(Action):

                     if self.str != self.install_config['password']:

                         curses.curs_set(0)

                         conf_message_height = 8

-                        conf_message_width = 40

+                        conf_message_width = 48

                         conf_message_button_y = (self.maxy - conf_message_height) / 2 + 5

-                        confrim_window = ConfirmWindow(conf_message_height, conf_message_width, self.maxy, self.maxx, conf_message_button_y, "passwords don't match, please try again.", True)

+                        confrim_window = ConfirmWindow(conf_message_height, conf_message_width, self.maxy, self.maxx, conf_message_button_y, "Passwords don't match, please try again.", True)

                         confrim_window.do_action()

                         return ActionResult(False, {'goBack': True})

                     self.install_config['password'] = self.generate_password_hash(self.str)

@@ -10,14 +10,14 @@ set -e

 set -x

 PROGRAM=$0

-WORKSPACE_DIR=$1

-RPMS_DIR=$WORKSPACE_DIR/stage/RPMS

-TEMP_CHROOT=$(pwd)/temp_chroot

+MAIN_PACKAGE=$1

+

+TEMP_CHROOT=$(pwd)/temp_chroot

 ROOTFS_TAR_FILENAME=photon-rootfs.tar.bz2

-STAGE_DIR=$WORKSPACE_DIR/stage

+STAGE_DIR=$(pwd)/stage

-cat > yum.conf <<- "EOF"

+cat > yum.conf <<- EOF

 [main]

 cachedir=$(pwd)/temp_chroot/var/cache/yum

@@ -27,9 +27,9 @@ logfile=$(pwd)/temp_chroot/var/log/yum.log

 exactarch=1

 obsoletes=1

-[photon]

+[photon-local]

 name=VMware Photon Linux 1.0(x86_64)

-baseurl=https://dl.bintray.com/vmware/photon_release_1.0_x86_64

+baseurl=file://$(pwd)/stage/RPMS

 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY

 gpgcheck=0

 enabled=1

@@ -41,34 +41,39 @@ rm -rf $TEMP_CHROOT

 mkdir $TEMP_CHROOT

 # use host's yum to install in chroot

-yum -c yum.conf --installroot=$TEMP_CHROOT install -y filesystem glibc

-yum -c yum.conf --installroot=$TEMP_CHROOT install -y bash tdnf coreutils photon-release

-yum -c yum.conf clean all

+mkdir -p $TEMP_CHROOT/var/lib/rpm

+rpm --root $TEMP_CHROOT/ --initdb

+yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT install -y filesystem glibc

+yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT install -y yum bash coreutils photon-release $MAIN_PACKAGE

+yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT clean all

+

 cp /etc/resolv.conf $TEMP_CHROOT/etc/

-# reinstalling inside to make sure rpmdb is created for tdnf.

-# TODO find better solution.

-chroot $TEMP_CHROOT bash -c \

-   "tdnf install -y filesystem; \

-    tdnf install -y glibc ; \

-    tdnf install -y bash ; \

-    tdnf install -y coreutils ; \

-    tdnf install -y tdnf ; \

-    tdnf install -y photon-release; \

-    rpm -e --nodeps perl; \

-    rpm -e --nodeps perl-DBD-SQLite; \

-    rpm -e --nodeps perl-Module-ScanDeps; \

-    rpm -e --nodeps perl-DBIx-Simple; \

-    rpm -e --nodeps perl-DBI; \

-    rpm -e --nodeps perl-WWW-Curl;"

+# # reinstalling inside to make sure rpmdb is created for tdnf.

+# # TODO find better solution.

+# chroot $TEMP_CHROOT bash -c \

+#    "tdnf install -y filesystem; \

+#     tdnf install -y glibc ; \

+#     tdnf install -y bash ; \

+#     tdnf install -y coreutils ; \

+#     tdnf install -y rpm-ostree ; \

+#     tdnf install -y photon-release; \

+#     rpm -e --nodeps perl; \

+#     rpm -e --nodeps perl-DBD-SQLite; \

+#     rpm -e --nodeps perl-Module-ScanDeps; \

+#     rpm -e --nodeps perl-DBIx-Simple; \

+#     rpm -e --nodeps perl-DBI; \

+#     rpm -e --nodeps perl-WWW-Curl;"

 cd $TEMP_CHROOT

 # cleanup anything not needed inside rootfs

 rm -rf usr/src/

 rm -rf home/*

-rm -rf var/lib/yum/*

+# rm -rf var/lib/yum/*

 rm -rf var/log/*

-find var/cache/tdnf/photon/rpms -type f -name "*.rpm" -exec rm {} \;

+

+#find var/cache/tdnf/photon/rpms -type f -name "*.rpm" -exec rm {} \;

+

 tar cpjf ../$ROOTFS_TAR_FILENAME .

 mkdir -p $STAGE_DIR

 mv ../$ROOTFS_TAR_FILENAME $STAGE_DIR/

new file mode 100755

@@ -0,0 +1,27 @@

+#!/bin/sh

+# Script to upload files to bintray. All files in source-path are uploaded to location 

+# configured in following parameters.

+

+ACCOUNT=vmware

+REPO=photon

+PACKAGE=rpm-ostree

+VERSION=dev

+

+if [ $# -lt 3 ]

+then

+    echo "Usage : " $0 " <Source Path>  <Username> <APIKEY>"

+    exit 1

+fi

+

+SRC_DIR=$1

+USER=$2

+APIKEY=$3

+

+(cd $SRC_DIR

+

+for FILE in `find . -type f`; do

+

+  echo "Uploading " $FILE

+  curl -vvf -T $FILE -u$USER:$APIKEY -H "X-Bintray-Package:$PACKAGE" -H "X-Bintray-Version:$VERSION" https://api.bintray.com/content/$ACCOUNT/$REPO/$PACKAGE/$VERSION/$FILE

+

+done)