-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #138 from edytuk/v2.5.0
Merge sylabs/sif through v2.7.0
- Loading branch information
Showing
91 changed files
with
803 additions
and
284 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| // Apptainer a Series of LF Projects LLC. | ||
| // For website terms of use, trademark policy, privacy policy and other | ||
| // project policies see https://lfprojects.org/policies | ||
| // Copyright (c) 2018-2021, Sylabs Inc. All rights reserved. | ||
| // Copyright (c) 2018-2022, Sylabs Inc. All rights reserved. | ||
| // Copyright (c) 2017, SingularityWare, LLC. All rights reserved. | ||
| // Copyright (c) 2017, Yannick Cote <[email protected]> All rights reserved. | ||
| // This software is licensed under a 3-clause BSD license. Please consult the | ||
|
|
@@ -16,6 +16,7 @@ import ( | |
| "io" | ||
| "os" | ||
| "runtime" | ||
| "strconv" | ||
| "text/tabwriter" | ||
|
|
||
| "github.com/apptainer/sif/v2/pkg/sif" | ||
|
|
@@ -28,7 +29,6 @@ var ( | |
| date = "" | ||
| builtBy = "" | ||
| commit = "" | ||
| state = "" | ||
| ) | ||
|
|
||
| func writeVersion(w io.Writer) error { | ||
|
|
@@ -42,11 +42,7 @@ func writeVersion(w io.Writer) error { | |
| } | ||
|
|
||
| if commit != "" { | ||
| if state == "" { | ||
| fmt.Fprintf(tw, "Commit:\t%v\n", commit) | ||
| } else { | ||
| fmt.Fprintf(tw, "Commit:\t%v (%v)\n", commit, state) | ||
| } | ||
| fmt.Fprintf(tw, "Commit:\t%v\n", commit) | ||
| } | ||
|
|
||
| if date != "" { | ||
|
|
@@ -83,7 +79,16 @@ possible to modify a SIF file via this tool via the add/del commands.`, | |
|
|
||
| root.AddCommand(getVersion()) | ||
|
|
||
| if err := siftool.AddCommands(&root); err != nil { | ||
| var experimental bool | ||
| if val, ok := os.LookupEnv("SIFTOOL_EXPERIMENTAL"); ok { | ||
| b, err := strconv.ParseBool(val) | ||
| if err != nil { | ||
| fmt.Fprintln(os.Stderr, "Error: failed to parse SIFTOOL_EXPERIMENTAL environment variable:", err) | ||
| } | ||
| experimental = b | ||
| } | ||
|
|
||
| if err := siftool.AddCommands(&root, siftool.OptWithExperimental(experimental)); err != nil { | ||
| fmt.Fprintln(os.Stderr, "Error:", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright (c) Contributors to the Apptainer project, established as | ||
| // Apptainer a Series of LF Projects LLC. | ||
| // For website terms of use, trademark policy, privacy policy and other | ||
| // project policies see https://lfprojects.org/policies | ||
| // Copyright (c) 2022, Sylabs Inc. All rights reserved. | ||
| // This software is licensed under a 3-clause BSD license. Please consult the | ||
| // LICENSE file distributed with the sources of this project regarding your | ||
| // rights to use or distribute this software. | ||
|
|
||
| package siftool | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/apptainer/sif/v2/pkg/user" | ||
| ) | ||
|
|
||
| // Mount mounts the primary system partition of the SIF file at path into mountPath. | ||
| func (a *App) Mount(ctx context.Context, path, mountPath string) error { | ||
| return user.Mount(ctx, path, mountPath, | ||
| user.OptMountStdout(a.opts.out), | ||
| user.OptMountStderr(a.opts.err), | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| -----BEGIN PGP SIGNED MESSAGE----- | ||
| Hash: SHA256 | ||
|
|
||
| {"version":1,"header":{"digest":"sha256:635fa0a14a8ef0c0351ed3e985799ed1d4f75ce973dea3cc76c99710795cc3f1"},"objects":[{"relativeId":0,"descriptorDigest":"sha256:3634ad01db0dd5482ecf685267b53d6201690438ca27c3d7ea91c971a1f41f92","objectDigest":"sha256:004dfc8da678c309de28b5386a1e9efd57f536b150c40d29b31506aa0fb17ec2"},{"relativeId":1,"descriptorDigest":"sha256:db74cb63348414def73535c9f0f83e8ad7df61229ed2806f4da8b69d6d7464d6","objectDigest":"sha256:5f78c33274e43fa9de5659265c1d917e25c03722dcb0b8d27db8d5feaa813953"}]} | ||
| {"version":1,"header":{"digest":"sha256:635fa0a14a8ef0c0351ed3e985799ed1d4f75ce973dea3cc76c99710795cc3f1"},"objects":[{"relativeId":0,"descriptorDigest":"sha256:3634ad01db0dd5482ecf685267b53d6201690438ca27c3d7ea91c971a1f41f92","objectDigest":"sha256:004dfc8da678c309de28b5386a1e9efd57f536b150c40d29b31506aa0fb17ec2"},{"relativeId":1,"descriptorDigest":"sha256:04b5f87c9692a54f80d10fb6af00c779763aeca29d610348854bd97cd8bf66fd","objectDigest":"sha256:9f9c4e5e131934969b4ac8f495691c70b8c6c8e3f489c2c9ab5f1af82bce0604"}]} | ||
| -----BEGIN PGP SIGNATURE----- | ||
|
|
||
| wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE | ||
| AADY9ggAlW/Y+BssNOLcCAiu0dzZCf5BfbzmOUQ+VNajAsZyOIJnW1t19lDYoRNx | ||
| x3YolyyRfEmw9Kf1n6fctDHGPyzRIIOc1/0CVQzNzfKZQO+x0+9qvurILADijY/3 | ||
| 1DKqhbxoO2a5iASXYHH9yYs3J82N3EKEYyFdDMTcHs4UijUnHvwcTt0smY6JQ9Su | ||
| vssWg+3qltuVjiYOQPgg9XR5i8suXE76poit9Ftp7jOD9eYtVcUEKRZLrVCsDJu9 | ||
| 77QvejJmgquueYX4pM2EuH9EOFnDV3gl4Cuocsn5OLDgfhYuT1t5Hay1iAPpJqm6 | ||
| /EXQY7CECByIj6TCFurfXwc+uYSD9Q== | ||
| =rZoe | ||
| AAC46gf/VXyzZ649nttrX13JkM5kRVPlAIblBQxfoUxA1xwIXdRoM5ceDY0Em+YD | ||
| 8b6Xl1w2sDTqo0R15cJSh8sf0ClFOvYpDQRNCwKx17k1Wd0gHcW4QVu6gJnlbNvN | ||
| o/EJdEN2TkbCM2aFvj34DAIfErRBIEsCeDDvJ/6WUSySWbnydfNU2pCsnK4A7l2H | ||
| KOXFzSaPijG9L/pU3O3vNZ+fXPffqHL9JVhs5Mt/Yo3oeoEnoVaKvJLGx/fyl+Gj | ||
| 7qsfWFyHWzRCww9VFg/TCBeUku0CYRfXhxOgo4OuHNr8oo82rKDZU6+l3UZ2Sw8T | ||
| +kLe/zUkaILocGOvhvKdi630OGGb/Q== | ||
| =3Jq2 | ||
| -----END PGP SIGNATURE----- |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.