Skip to content

Commit d5b307d

Browse files
authored
Merge pull request #3797 from sylabs/dependabot/go_modules/main/moby-435a8d31ae
chore(deps): bump the moby group with 3 updates
2 parents f971cb0 + f0715f2 commit d5b307d

File tree

5 files changed

+227
-13
lines changed

5 files changed

+227
-13
lines changed

LICENSE_DEPENDENCIES.md

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20254,6 +20254,217 @@ THE SOFTWARE.
2025420254
```
2025520255

2025620256

20257+
## github.com/moby/profiles/seccomp
20258+
20259+
**License:** Apache-2.0
20260+
20261+
```
20262+
20263+
Apache License
20264+
Version 2.0, January 2004
20265+
http://www.apache.org/licenses/
20266+
20267+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
20268+
20269+
1. Definitions.
20270+
20271+
"License" shall mean the terms and conditions for use, reproduction,
20272+
and distribution as defined by Sections 1 through 9 of this document.
20273+
20274+
"Licensor" shall mean the copyright owner or entity authorized by
20275+
the copyright owner that is granting the License.
20276+
20277+
"Legal Entity" shall mean the union of the acting entity and all
20278+
other entities that control, are controlled by, or are under common
20279+
control with that entity. For the purposes of this definition,
20280+
"control" means (i) the power, direct or indirect, to cause the
20281+
direction or management of such entity, whether by contract or
20282+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
20283+
outstanding shares, or (iii) beneficial ownership of such entity.
20284+
20285+
"You" (or "Your") shall mean an individual or Legal Entity
20286+
exercising permissions granted by this License.
20287+
20288+
"Source" form shall mean the preferred form for making modifications,
20289+
including but not limited to software source code, documentation
20290+
source, and configuration files.
20291+
20292+
"Object" form shall mean any form resulting from mechanical
20293+
transformation or translation of a Source form, including but
20294+
not limited to compiled object code, generated documentation,
20295+
and conversions to other media types.
20296+
20297+
"Work" shall mean the work of authorship, whether in Source or
20298+
Object form, made available under the License, as indicated by a
20299+
copyright notice that is included in or attached to the work
20300+
(an example is provided in the Appendix below).
20301+
20302+
"Derivative Works" shall mean any work, whether in Source or Object
20303+
form, that is based on (or derived from) the Work and for which the
20304+
editorial revisions, annotations, elaborations, or other modifications
20305+
represent, as a whole, an original work of authorship. For the purposes
20306+
of this License, Derivative Works shall not include works that remain
20307+
separable from, or merely link (or bind by name) to the interfaces of,
20308+
the Work and Derivative Works thereof.
20309+
20310+
"Contribution" shall mean any work of authorship, including
20311+
the original version of the Work and any modifications or additions
20312+
to that Work or Derivative Works thereof, that is intentionally
20313+
submitted to Licensor for inclusion in the Work by the copyright owner
20314+
or by an individual or Legal Entity authorized to submit on behalf of
20315+
the copyright owner. For the purposes of this definition, "submitted"
20316+
means any form of electronic, verbal, or written communication sent
20317+
to the Licensor or its representatives, including but not limited to
20318+
communication on electronic mailing lists, source code control systems,
20319+
and issue tracking systems that are managed by, or on behalf of, the
20320+
Licensor for the purpose of discussing and improving the Work, but
20321+
excluding communication that is conspicuously marked or otherwise
20322+
designated in writing by the copyright owner as "Not a Contribution."
20323+
20324+
"Contributor" shall mean Licensor and any individual or Legal Entity
20325+
on behalf of whom a Contribution has been received by Licensor and
20326+
subsequently incorporated within the Work.
20327+
20328+
2. Grant of Copyright License. Subject to the terms and conditions of
20329+
this License, each Contributor hereby grants to You a perpetual,
20330+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
20331+
copyright license to reproduce, prepare Derivative Works of,
20332+
publicly display, publicly perform, sublicense, and distribute the
20333+
Work and such Derivative Works in Source or Object form.
20334+
20335+
3. Grant of Patent License. Subject to the terms and conditions of
20336+
this License, each Contributor hereby grants to You a perpetual,
20337+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
20338+
(except as stated in this section) patent license to make, have made,
20339+
use, offer to sell, sell, import, and otherwise transfer the Work,
20340+
where such license applies only to those patent claims licensable
20341+
by such Contributor that are necessarily infringed by their
20342+
Contribution(s) alone or by combination of their Contribution(s)
20343+
with the Work to which such Contribution(s) was submitted. If You
20344+
institute patent litigation against any entity (including a
20345+
cross-claim or counterclaim in a lawsuit) alleging that the Work
20346+
or a Contribution incorporated within the Work constitutes direct
20347+
or contributory patent infringement, then any patent licenses
20348+
granted to You under this License for that Work shall terminate
20349+
as of the date such litigation is filed.
20350+
20351+
4. Redistribution. You may reproduce and distribute copies of the
20352+
Work or Derivative Works thereof in any medium, with or without
20353+
modifications, and in Source or Object form, provided that You
20354+
meet the following conditions:
20355+
20356+
(a) You must give any other recipients of the Work or
20357+
Derivative Works a copy of this License; and
20358+
20359+
(b) You must cause any modified files to carry prominent notices
20360+
stating that You changed the files; and
20361+
20362+
(c) You must retain, in the Source form of any Derivative Works
20363+
that You distribute, all copyright, patent, trademark, and
20364+
attribution notices from the Source form of the Work,
20365+
excluding those notices that do not pertain to any part of
20366+
the Derivative Works; and
20367+
20368+
(d) If the Work includes a "NOTICE" text file as part of its
20369+
distribution, then any Derivative Works that You distribute must
20370+
include a readable copy of the attribution notices contained
20371+
within such NOTICE file, excluding those notices that do not
20372+
pertain to any part of the Derivative Works, in at least one
20373+
of the following places: within a NOTICE text file distributed
20374+
as part of the Derivative Works; within the Source form or
20375+
documentation, if provided along with the Derivative Works; or,
20376+
within a display generated by the Derivative Works, if and
20377+
wherever such third-party notices normally appear. The contents
20378+
of the NOTICE file are for informational purposes only and
20379+
do not modify the License. You may add Your own attribution
20380+
notices within Derivative Works that You distribute, alongside
20381+
or as an addendum to the NOTICE text from the Work, provided
20382+
that such additional attribution notices cannot be construed
20383+
as modifying the License.
20384+
20385+
You may add Your own copyright statement to Your modifications and
20386+
may provide additional or different license terms and conditions
20387+
for use, reproduction, or distribution of Your modifications, or
20388+
for any such Derivative Works as a whole, provided Your use,
20389+
reproduction, and distribution of the Work otherwise complies with
20390+
the conditions stated in this License.
20391+
20392+
5. Submission of Contributions. Unless You explicitly state otherwise,
20393+
any Contribution intentionally submitted for inclusion in the Work
20394+
by You to the Licensor shall be under the terms and conditions of
20395+
this License, without any additional terms or conditions.
20396+
Notwithstanding the above, nothing herein shall supersede or modify
20397+
the terms of any separate license agreement you may have executed
20398+
with Licensor regarding such Contributions.
20399+
20400+
6. Trademarks. This License does not grant permission to use the trade
20401+
names, trademarks, service marks, or product names of the Licensor,
20402+
except as required for reasonable and customary use in describing the
20403+
origin of the Work and reproducing the content of the NOTICE file.
20404+
20405+
7. Disclaimer of Warranty. Unless required by applicable law or
20406+
agreed to in writing, Licensor provides the Work (and each
20407+
Contributor provides its Contributions) on an "AS IS" BASIS,
20408+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
20409+
implied, including, without limitation, any warranties or conditions
20410+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
20411+
PARTICULAR PURPOSE. You are solely responsible for determining the
20412+
appropriateness of using or redistributing the Work and assume any
20413+
risks associated with Your exercise of permissions under this License.
20414+
20415+
8. Limitation of Liability. In no event and under no legal theory,
20416+
whether in tort (including negligence), contract, or otherwise,
20417+
unless required by applicable law (such as deliberate and grossly
20418+
negligent acts) or agreed to in writing, shall any Contributor be
20419+
liable to You for damages, including any direct, indirect, special,
20420+
incidental, or consequential damages of any character arising as a
20421+
result of this License or out of the use or inability to use the
20422+
Work (including but not limited to damages for loss of goodwill,
20423+
work stoppage, computer failure or malfunction, or any and all
20424+
other commercial damages or losses), even if such Contributor
20425+
has been advised of the possibility of such damages.
20426+
20427+
9. Accepting Warranty or Additional Liability. While redistributing
20428+
the Work or Derivative Works thereof, You may choose to offer,
20429+
and charge a fee for, acceptance of support, warranty, indemnity,
20430+
or other liability obligations and/or rights consistent with this
20431+
License. However, in accepting such obligations, You may act only
20432+
on Your own behalf and on Your sole responsibility, not on behalf
20433+
of any other Contributor, and only if You agree to indemnify,
20434+
defend, and hold each Contributor harmless for any liability
20435+
incurred by, or claims asserted against, such Contributor by reason
20436+
of your accepting any such warranty or additional liability.
20437+
20438+
END OF TERMS AND CONDITIONS
20439+
20440+
APPENDIX: How to apply the Apache License to your work.
20441+
20442+
To apply the Apache License to your work, attach the following
20443+
boilerplate notice, with the fields enclosed by brackets "[]"
20444+
replaced with your own identifying information. (Don't include
20445+
the brackets!) The text should be enclosed in the appropriate
20446+
comment syntax for the file format. We also recommend that a
20447+
file or class name and description of purpose be included on the
20448+
same "printed page" as the copyright notice for easier
20449+
identification within third-party archives.
20450+
20451+
Copyright [yyyy] [name of copyright owner]
20452+
20453+
Licensed under the Apache License, Version 2.0 (the "License");
20454+
you may not use this file except in compliance with the License.
20455+
You may obtain a copy of the License at
20456+
20457+
http://www.apache.org/licenses/LICENSE-2.0
20458+
20459+
Unless required by applicable law or agreed to in writing, software
20460+
distributed under the License is distributed on an "AS IS" BASIS,
20461+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
20462+
See the License for the specific language governing permissions and
20463+
limitations under the License.
20464+
20465+
```
20466+
20467+
2025720468
## github.com/moby/sys/atomicwriter
2025820469

2025920470
**License:** Apache-2.0

go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ require (
2121
github.com/containers/image/v5 v5.36.2
2222
github.com/coreos/go-systemd/v22 v22.6.0
2323
github.com/cyphar/filepath-securejoin v0.4.1
24-
github.com/docker/cli v28.3.3+incompatible
24+
github.com/docker/cli v28.4.0+incompatible
2525
github.com/docker/distribution v2.8.3+incompatible
26-
github.com/docker/docker v28.3.3+incompatible
26+
github.com/docker/docker v28.4.0+incompatible
2727
github.com/docker/go-units v0.5.0
2828
github.com/fatih/color v1.18.0
2929
github.com/go-log/log v0.2.0
3030
github.com/gofrs/flock v0.12.1
3131
github.com/google/go-containerregistry v0.20.6
3232
github.com/google/uuid v1.6.0
3333
github.com/gosimple/slug v1.15.0
34-
github.com/moby/buildkit v0.23.2
34+
github.com/moby/buildkit v0.24.0
3535
github.com/moby/go-archive v0.1.0
36+
github.com/moby/profiles/seccomp v0.1.0
3637
github.com/moby/sys/sequential v0.6.0
3738
github.com/moby/sys/user v0.4.0
3839
github.com/moby/sys/userns v0.1.0

go.sum

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -937,13 +937,13 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi
937937
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
938938
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
939939
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
940-
github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
941-
github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
940+
github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY=
941+
github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
942942
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
943943
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
944944
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
945-
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
946-
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
945+
github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk=
946+
github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
947947
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
948948
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
949949
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -1387,8 +1387,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4
13871387
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
13881388
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
13891389
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
1390-
github.com/moby/buildkit v0.23.2 h1:gt/dkfcpgTXKx+B9I310kV767hhVqTvEyxGgI3mqsGQ=
1391-
github.com/moby/buildkit v0.23.2/go.mod h1:iEjAfPQKIuO+8y6OcInInvzqTMiKMbb2RdJz1K/95a0=
1390+
github.com/moby/buildkit v0.24.0 h1:qYfTl7W1SIJzWDIDCcPT8FboHIZCYfi++wvySi3eyFE=
1391+
github.com/moby/buildkit v0.24.0/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
13921392
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
13931393
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
13941394
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
@@ -1397,6 +1397,8 @@ github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
13971397
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
13981398
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
13991399
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
1400+
github.com/moby/profiles/seccomp v0.1.0 h1:kVf1lc5ytNB1XPxEdZUVF+oPpbBYJHR50eEvPt/9k8A=
1401+
github.com/moby/profiles/seccomp v0.1.0/go.mod h1:Kqk57vxH6/wuOc5bmqRiSXJ6iEz8Pvo3LQRkv0ytFWs=
14001402
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
14011403
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
14021404
github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=

internal/pkg/runtime/engine/config/oci/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"encoding/json"
1010
"fmt"
1111

12-
dseccomp "github.com/docker/docker/profiles/seccomp"
12+
mseccomp "github.com/moby/profiles/seccomp"
1313
"github.com/opencontainers/cgroups"
1414
specs "github.com/opencontainers/runtime-spec/specs-go"
1515
"github.com/sylabs/singularity/v4/internal/pkg/runtime/engine/config/oci/generate"
@@ -174,7 +174,7 @@ func DefaultConfigV1() (*generate.Generator, error) {
174174
}
175175

176176
if seccomp.Enabled() {
177-
config.Linux.Seccomp, err = dseccomp.GetDefaultProfile(&config)
177+
config.Linux.Seccomp, err = mseccomp.GetDefaultProfile(&config)
178178
if err != nil {
179179
return nil, fmt.Errorf("failed to get seccomp default profile: %s", err)
180180
}

internal/pkg/security/seccomp/seccomp_supported.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"syscall"
1616

1717
"github.com/ccoveille/go-safecast"
18-
dseccomp "github.com/docker/docker/profiles/seccomp"
18+
mseccomp "github.com/moby/profiles/seccomp"
1919
"github.com/opencontainers/runtime-spec/specs-go"
2020
lseccomp "github.com/seccomp/libseccomp-golang"
2121
"github.com/sylabs/singularity/v4/internal/pkg/runtime/engine/config/oci/generate"
@@ -285,7 +285,7 @@ func LoadProfileFromFile(profile string, generator *generate.Generator) error {
285285
generator.Config.Process.Capabilities = &specs.LinuxCapabilities{}
286286
}
287287

288-
seccompConfig, err := dseccomp.LoadProfile(string(data), generator.Config)
288+
seccompConfig, err := mseccomp.LoadProfile(string(data), generator.Config)
289289
if err != nil {
290290
return err
291291
}

0 commit comments

Comments
 (0)