Merge pull request #5787 from hpcng/master

Merge without-seccomp and detached build message for 3.7.1

Author: dtrudg

CHANGELOG.md

@@ -22,6 +22,7 @@ _The old changelog can be found in the `release-2.6` branch_
     when using plugins.
   - Remove spurious warning in parseTokenSection()
   - e2e test fixes for new kernels, new unsquashfs version.
+  - Show correct web URI for detached builds against alternate remotes.
 
 
 # v3.7.0 - [2020-11-24]

cmd/internal/cli/build.go

@@ -33,6 +33,7 @@ var buildArgs struct {
 	builderURL   string
 	libraryURL   string
 	keyServerURL string
+	webURL       string
 	detached     bool
 	encrypt      bool
 	fakeroot     bool

cmd/internal/cli/build_darwin.go

@@ -40,6 +40,14 @@ func runBuild(cmd *cobra.Command, args []string) {
 	buildArgs.libraryURL = lc.BaseURL
 	buildArgs.builderURL = bc.BaseURL
 
+	// To provide a web link to detached remote builds we need to know the web frontend URI.
+	// We only know this working forward from a remote config, and not if the user has set custom
+	// service URLs, since there is no straightforward foolproof way to work back from them to a
+	// matching frontend URL.
+	if !cmd.Flag("builder").Changed && !cmd.Flag("library").Changed {
+		buildArgs.webURL = URI()
+	}
+
 	// Submiting a remote build requires a valid authToken
 	if bc.AuthToken == "" {
 		sylog.Fatalf("Unable to submit build job: %v", remoteWarning)
@@ -50,7 +58,7 @@ func runBuild(cmd *cobra.Command, args []string) {
 		sylog.Fatalf("Unable to build from %s: %v", spec, err)
 	}
 
-	b, err := remotebuilder.New(dest, buildArgs.libraryURL, def, buildArgs.detached, forceOverwrite, buildArgs.builderURL, bc.AuthToken, buildArgs.arch)
+	b, err := remotebuilder.New(dest, buildArgs.libraryURL, def, buildArgs.detached, forceOverwrite, buildArgs.builderURL, bc.AuthToken, buildArgs.arch, buildArgs.webURL)
 	if err != nil {
 		sylog.Fatalf("Failed to create builder: %v", err)
 	}

cmd/internal/cli/build_linux.go

@@ -133,6 +133,14 @@ func runBuildRemote(ctx context.Context, cmd *cobra.Command, dst, spec string) {
 	buildArgs.libraryURL = lc.BaseURL
 	buildArgs.builderURL = bc.BaseURL
 
+	// To provide a web link to detached remote builds we need to know the web frontend URI.
+	// We only know this working forward from a remote config, and not if the user has set custom
+	// service URLs, since there is no straightforward foolproof way to work back from them to a
+	// matching frontend URL.
+	if !cmd.Flag("builder").Changed && !cmd.Flag("library").Changed {
+		buildArgs.webURL = URI()
+	}
+
 	// submitting a remote build requires a valid authToken
 	if bc.AuthToken == "" {
 		sylog.Fatalf("Unable to submit build job: %v", remoteWarning)
@@ -202,7 +210,7 @@ func runBuildRemote(ctx context.Context, cmd *cobra.Command, dst, spec string) {
 		}()
 	}
 
-	b, err := remotebuilder.New(rbDst, buildArgs.libraryURL, def, buildArgs.detached, forceOverwrite, buildArgs.builderURL, bc.AuthToken, buildArgs.arch)
+	b, err := remotebuilder.New(rbDst, buildArgs.libraryURL, def, buildArgs.detached, forceOverwrite, buildArgs.builderURL, bc.AuthToken, buildArgs.arch, buildArgs.webURL)
 	if err != nil {
 		sylog.Fatalf("Failed to create builder: %v", err)
 	}

internal/pkg/build/remotebuilder/remotebuilder.go

@@ -31,9 +31,6 @@ import (
 	useragent "github.com/sylabs/singularity/pkg/util/user-agent"
 )
 
-// CloudURI holds the URI of the Library web front-end.
-const CloudURI = "https://cloud.sylabs.io"
-
 // RemoteBuilder contains the build request and response
 type RemoteBuilder struct {
 	BuildClient         *buildclient.Client
@@ -45,10 +42,11 @@ type RemoteBuilder struct {
 	Force               bool
 	IsDetached          bool
 	BuilderRequirements map[string]string
+	WebURL              string
 }
 
 // New creates a RemoteBuilder with the specified details.
-func New(imagePath, libraryURL string, d types.Definition, isDetached, force bool, builderAddr, authToken, buildArch string) (rb *RemoteBuilder, err error) {
+func New(imagePath, libraryURL string, d types.Definition, isDetached, force bool, builderAddr, authToken, buildArch, webURL string) (rb *RemoteBuilder, err error) {
 	bc, err := buildclient.New(&buildclient.Config{
 		BaseURL:   builderAddr,
 		AuthToken: authToken,
@@ -73,6 +71,7 @@ func New(imagePath, libraryURL string, d types.Definition, isDetached, force boo
 		BuilderRequirements: map[string]string{
 			"arch": buildArch,
 		},
+		WebURL: webURL,
 	}, nil
 }
 
@@ -107,7 +106,9 @@ func (rb *RemoteBuilder) Build(ctx context.Context) (err error) {
 	if rb.IsDetached {
 		fmt.Printf("Build submitted! Once it is complete, the image can be retrieved by running:\n")
 		fmt.Printf("\tsingularity pull --library %s library://%s\n\n", bi.LibraryURL, libraryRefRaw)
-		fmt.Printf("Alternatively, you can access it from a browser at:\n\t%s/library/%s\n", CloudURI, libraryRefRaw)
+		if rb.WebURL != "" {
+			fmt.Printf("Alternatively, you can access it from a browser at:\n\t%s/library/%s\n", rb.WebURL, libraryRefRaw)
+		}
 		return nil
 	}
 

internal/pkg/build/remotebuilder/remotebuilder_test.go

@@ -39,7 +39,7 @@ func TestBuild(t *testing.T) {
 	// Loop over test cases
 	for _, tt := range tests {
 		t.Run(tt.description, test.WithoutPrivilege(func(t *testing.T) {
-			_, err := New("", "", types.Definition{}, false, false, tt.builderAddr, "", runtime.GOARCH)
+			_, err := New("", "", types.Definition{}, false, false, tt.builderAddr, "", runtime.GOARCH, "")
 			if tt.expectSuccess {
 				// Ensure the handler returned no error, and the response is as expected
 				if err != nil {

mconfig

@@ -57,6 +57,7 @@ fi
 
 with_network=1
 with_suid=1
+with_seccomp_check=1
 
 prefix=
 exec_prefix=
@@ -111,6 +112,7 @@ usage_args () {
 	echo "  Singularity options:"
 	echo "     --without-suid    do not install SUID binary (linux only)"
 	echo "     --without-network do not compile/install network plugins (linux only)"
+	echo "     --without-seccomp do not compile/install seccomp support even if available"
 	echo
 	echo "  Path modification options:"
 	echo "     --prefix         install project in \`prefix'"
@@ -361,6 +363,8 @@ while [ $# -ne 0 ]; do
    with_suid=0; shift;;
   --without-network)
    with_network=0; shift;;
+  --without-seccomp)
+   with_seccomp_check=0; shift;;
   -V)
    if ! echo "$2" | awk '/^-.*/ || /^$/ { exit 2 }'; then
      echo "error: option requires an argument: $1"

mlocal/checks/project-post.chk

@@ -303,15 +303,17 @@ fi
 ########################
 # libseccomp dev
 ########################
-printf " checking: libseccomp+headers... "
-seccomp_iflags=`pkg-config --cflags-only-I libseccomp 2>/dev/null || true`
-if ! printf "#include <seccomp.h>\nint main() { seccomp_syscall_resolve_name(\"read\"); }" | \
-   $tgtcc $user_cflags $ldflags $seccomp_iflags -x c -o /dev/null - -lseccomp >/dev/null 2>&1; then
-    tgtstatic=0
-    echo "no"
-else
-    echo "yes"
-    appsec=1
+if [ "$with_seccomp_check" = "1" ];then
+    printf " checking: libseccomp+headers... "
+    seccomp_iflags=`pkg-config --cflags-only-I libseccomp 2>/dev/null || true`
+    if ! printf "#include <seccomp.h>\nint main() { seccomp_syscall_resolve_name(\"read\"); }" | \
+       $tgtcc $user_cflags $ldflags $seccomp_iflags -x c -o /dev/null - -lseccomp >/dev/null 2>&1; then
+	tgtstatic=0
+	echo "no"
+    else
+	echo "yes"
+	appsec=1
+    fi
 fi
 
 ########################