Pull #1 of Sylabs PRs in preparation for v3.8.1 #6094
Closed
Conversation
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
Rather than include config.h through CGO_CFLAGS in mconfig, include directly in relevant source. This allows tools such as code editors and linters that are not aware of makeit the ability to build/parse the file.
The github.com/satori/go.uuid package is no longer maintained. We cannot fully replace this yet because the github.com/sylabs/sif API requires it. For now, replace all other uses of github.com/satori/go.uuid with github.com/google/uuid. Conflicts: e2e/imgbuild/regressions.go e2e/instance/instance.go e2e/oci/oci.go pkg/util/crypt/crypt_dev.go
Not a file used or understood by GitHub. It's intended for humans, so should be somewhere more noticable :-) Fixes apptainer#127
Change to sandbox to keep restrictive permissions was made in Singularity 3.5. It's now appropriate to revise the message so it doesn't point to a discussion thread, and is just a plain warning. Fixes apptainer#85 Conflicts: internal/pkg/build/sources/oci_unpack.go
Conflicts: .circleci/config.yml INSTALL.md
In a multi-stage build `%copy`, if the source for the copy line is a symlink we should dereference it and copy the target. Note that if we are copying a directory we shouldn't dereference any symlinks within the directory, only the directory itself. Previously we were doing a straight `cp -frH` to implement this, but it does not handle the case where a symlink to be copied is an absolute symlink. The absolute symlink's target is correct in the context of the stage's rootfs, but we are copying in the host context. To fix this we manually dereference the top level src of a `%copy` line, in a manner that will resolve absolute symlinks relative to the src stage's rootfs correctly. This PR also: - Splits host->rootfs copy, and stage->stage copy functions. - Rewrites the tests for host->rootfs and stage->stage copy functions to cover more cases including top-level and nested source files, dirs, and absolute + relative symlinks. - Uses securejoin to restrict resolution of paths to being inside of a rootfs where this is appropriate. This is for least-surprise rather than security, as the hostfs is still modifiable in `%setup` etc. Fixes apptainer#159
Conflicts: go.mod
In a multi-stage build `%copy`, if the source for the copy line is a symlink we should dereference it and copy the target. Note that if we are copying a directory we shouldn't dereference any symlinks within the directory, only the directory itself. Previously we were doing a straight `cp -frH` to implement this, but it does not handle the case where a symlink to be copied is an absolute symlink. The absolute symlink's target is correct in the context of the stage's rootfs, but we are copying in the host context. To fix this we manually dereference the top level src of a `%copy` line, in a manner that will resolve absolute symlinks relative to the src stage's rootfs correctly. This PR also: - Splits host->rootfs copy, and stage->stage copy functions. - Rewrites the tests for host->rootfs and stage->stage copy functions to cover more cases including top-level and nested source files, dirs, and absolute + relative symlinks. - Uses securejoin to restrict resolution of paths to being inside of a rootfs where this is appropriate. This is for least-surprise rather than security, as the hostfs is still modifiable in `%setup` etc. Fixes apptainer#159 Conflicts: go.mod
Conflicts: CHANGELOG.md
Conflicts: e2e/imgbuild/regressions.go e2e/instance/instance.go e2e/instance/regressions.go e2e/oci/oci.go internal/app/singularity/plugin_compile_linux.go internal/pkg/build/assemblers/sif.go pkg/image/sif_test.go pkg/util/crypt/crypt_dev.go
ikaneshiro
reviewed
Aug 3, 2021
|
@kmuriki It looks like the e2e tests are failing because sylabs/singularity@78f8778 has not been pulled in |
Yeah and many of the other ci tests are failing with the same error. |
DrDaveD
reviewed
Aug 3, 2021
e2e/instance/instance.go
Outdated
| @@ -309,7 +318,11 @@ func (c *ctx) applyCgroupsInstance(t *testing.T) { | |||
| } | |||
|
|
|||
| // pick up a random name | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
I still see <<<< merge text here, and in regressions.go
|
Let me try pulling these PRs one at a time and resolve all these conflicts. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR handles issues #6080 #6078 #6077 #6064 #6063 and #6062