fix travis

blablacar · May 19, 2016 · 6228bec · 6228bec
1 parent 40e9d7b
commit 6228bec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.travis-install-rkt.sh b/.travis-install-rkt.sh
@@ -12,5 +12,9 @@ $(rkt version | grep "${version}") || {
 	wget $url
 	tar xvzf "${filename}"
 	cp rkt*/rkt rkt*/stage1* /bin/
+	chmod +x /bin/rkt
+	mkdir -p /var/lib/rkt
 	cd -
 }
+
+rkt version
diff --git a/bin-dgr/aci-build.go b/bin-dgr/aci-build.go
@@ -175,6 +175,10 @@ func (aci *Aci) prepareBuildAci() (string, error) {
 		return "", errs.WithEF(err, aci.fields.WithField("path", aci.target+pathBuilder), "Failed to create builder aci path")
 	}
 
+	if err := ioutil.WriteFile(aci.target+pathBuilder+common.PathRootfs+"/.keep", []byte(""), 0644); err != nil {
+		return "", errs.WithEF(err, aci.fields.WithField("file", aci.target+pathBuilder+common.PathRootfs+"/.keep"), "Failed to write keep file")
+	}
+
 	if err := common.WriteAciManifest(aci.manifest, aci.target+pathBuilder+common.PathManifest, common.PrefixBuilder+aci.manifest.NameAndVersion.Name(), dgrVersion); err != nil {
 		return "", err
 	}

diff --git a/bin-dgr/aci.go b/bin-dgr/aci.go
@@ -122,7 +122,7 @@ func (aci *Aci) tarAci(path string) error {
 	if err := tar.AddFile(path + common.PathManifest); err != nil {
 		return errs.WithEF(err, aci.fields.WithField("path", path+common.PathManifest), "Failed to add manifest to tar")
 	}
-	if err := tar.AddAll(path+common.PathRootfs, false); err != nil {
+	if err := tar.AddAll(path+common.PathRootfs, true); err != nil {
 		return errs.WithEF(err, aci.fields.WithField("path", path+common.PathRootfs), "Failed to add rootfs to tar")
 	}
 	if err := tar.Close(); err != nil {