Merge bug fix for 3.3

Author: WestleyK

cmd/internal/cli/build_linux.go

@@ -178,7 +178,7 @@ func run(cmd *cobra.Command, args []string) {
 			sylog.Fatalf("While performing build: %v", err)
 		}
 	} else {
-		if syscall.Getuid() != 0 && !fakeroot && fs.IsFile(spec) {
+		if syscall.Getuid() != 0 && !fakeroot && fs.IsFile(spec) && !isImage(spec) {
 			sylog.Fatalf("You must be the root user, however you can use --remote or --fakeroot to build from a Singularity recipe file")
 		}
 
@@ -187,10 +187,6 @@ func run(cmd *cobra.Command, args []string) {
 			sylog.Fatalf("failed to create an image cache handle")
 		}
 
-		if syscall.Getuid() != 0 && !fakeroot && fs.IsFile(spec) && !isImage(spec) {
-			sylog.Fatalf("You must be the root user, however you can use --remote or --fakeroot to build from a Singularity recipe file")
-		}
-
 		err := checkSections()
 		if err != nil {
 			sylog.Fatalf(err.Error())