Skip to content

Commit

Permalink
Merge pull request #6211 from cclerget/issue-6181
Browse files Browse the repository at this point in the history
Remove environment variables eval for --bind, --nv and --rocm for build command
  • Loading branch information
DrDaveD authored Oct 12, 2021
2 parents e6410e3 + b647824 commit 1aaebe1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
Docker/OCI container.
- Instances are no longer created with an IPC namespace by default. An IPC
namespace can be specified with the `-i|--ipc` flag.
- `--bind`, `--nv` and `--rocm` options for `build` command can't be set through
environment variables `SINGULARITY_BIND`, `SINGULARITY_BINDPATH`, `SINGULARITY_NV`,
`SINGULARITY_ROCM` anymore due to side effects reported by users in this
[issue](https://github.com/hpcng/singularity/pull/6211), they must be explicitely
requested via command line.
- `--nohttps` flag has been deprecated in favour of `--no-https`. The old flag
is still accepted, but will display a deprecation warning.
- Removed `--nonet` flag, which was intended to disable networking for in-VM
Expand Down
4 changes: 0 additions & 4 deletions cmd/internal/cli/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ var buildNvFlag = cmdline.Flag{
DefaultValue: false,
Name: "nv",
Usage: "inject host Nvidia libraries during build for post and test sections (not supported with remote build)",
EnvKeys: []string{"NV"},
}

// --rocm
Expand All @@ -225,7 +224,6 @@ var buildRocmFlag = cmdline.Flag{
DefaultValue: false,
Name: "rocm",
Usage: "inject host Rocm libraries during build for post and test sections (not supported with remote build)",
EnvKeys: []string{"ROCM"},
}

// -B|--bind
Expand All @@ -240,8 +238,6 @@ var buildBindFlag = cmdline.Flag{
"it is set equal to src. Mount options ('opts') may be specified as 'ro'" +
"(read-only) or 'rw' (read/write, which is the default)." +
"Multiple bind paths can be given by a comma separated list. (not supported with remote build)",
EnvKeys: []string{"BIND", "BINDPATH"},
EnvHandler: cmdline.EnvAppendValue,
}

// --writable-tmpfs
Expand Down

0 comments on commit 1aaebe1

Please sign in to comment.