Skip to content

Commit ad95f5f

Browse files
author
github-actions
committed
Merge branch 'main' into cras
2 parents 84dab1d + 55a28e0 commit ad95f5f

File tree

4 files changed

+279
-59
lines changed

4 files changed

+279
-59
lines changed

INSTALL.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,13 @@ git clone --recurse-submodules https://github.com/sylabs/singularity.git
198198
cd singularity
199199
```
200200

201+
If the repository was already cloned without submodules, the submodules can be
202+
pulled by executing the following command from the root folder:
203+
204+
```sh
205+
git submodule update --init
206+
```
207+
201208
By default your clone will be on the `main` branch which is where development
202209
of SingularityCE happens. To build a specific version of SingularityCE, check
203210
out a [release tag](https://github.com/sylabs/singularity/tags) before

LICENSE_DEPENDENCIES.md

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20654,6 +20654,216 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2065420654
```
2065520655

2065620656

20657+
## go.opentelemetry.io/auto/sdk
20658+
20659+
**License:** Apache-2.0
20660+
20661+
```
20662+
Apache License
20663+
Version 2.0, January 2004
20664+
http://www.apache.org/licenses/
20665+
20666+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
20667+
20668+
1. Definitions.
20669+
20670+
"License" shall mean the terms and conditions for use, reproduction,
20671+
and distribution as defined by Sections 1 through 9 of this document.
20672+
20673+
"Licensor" shall mean the copyright owner or entity authorized by
20674+
the copyright owner that is granting the License.
20675+
20676+
"Legal Entity" shall mean the union of the acting entity and all
20677+
other entities that control, are controlled by, or are under common
20678+
control with that entity. For the purposes of this definition,
20679+
"control" means (i) the power, direct or indirect, to cause the
20680+
direction or management of such entity, whether by contract or
20681+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
20682+
outstanding shares, or (iii) beneficial ownership of such entity.
20683+
20684+
"You" (or "Your") shall mean an individual or Legal Entity
20685+
exercising permissions granted by this License.
20686+
20687+
"Source" form shall mean the preferred form for making modifications,
20688+
including but not limited to software source code, documentation
20689+
source, and configuration files.
20690+
20691+
"Object" form shall mean any form resulting from mechanical
20692+
transformation or translation of a Source form, including but
20693+
not limited to compiled object code, generated documentation,
20694+
and conversions to other media types.
20695+
20696+
"Work" shall mean the work of authorship, whether in Source or
20697+
Object form, made available under the License, as indicated by a
20698+
copyright notice that is included in or attached to the work
20699+
(an example is provided in the Appendix below).
20700+
20701+
"Derivative Works" shall mean any work, whether in Source or Object
20702+
form, that is based on (or derived from) the Work and for which the
20703+
editorial revisions, annotations, elaborations, or other modifications
20704+
represent, as a whole, an original work of authorship. For the purposes
20705+
of this License, Derivative Works shall not include works that remain
20706+
separable from, or merely link (or bind by name) to the interfaces of,
20707+
the Work and Derivative Works thereof.
20708+
20709+
"Contribution" shall mean any work of authorship, including
20710+
the original version of the Work and any modifications or additions
20711+
to that Work or Derivative Works thereof, that is intentionally
20712+
submitted to Licensor for inclusion in the Work by the copyright owner
20713+
or by an individual or Legal Entity authorized to submit on behalf of
20714+
the copyright owner. For the purposes of this definition, "submitted"
20715+
means any form of electronic, verbal, or written communication sent
20716+
to the Licensor or its representatives, including but not limited to
20717+
communication on electronic mailing lists, source code control systems,
20718+
and issue tracking systems that are managed by, or on behalf of, the
20719+
Licensor for the purpose of discussing and improving the Work, but
20720+
excluding communication that is conspicuously marked or otherwise
20721+
designated in writing by the copyright owner as "Not a Contribution."
20722+
20723+
"Contributor" shall mean Licensor and any individual or Legal Entity
20724+
on behalf of whom a Contribution has been received by Licensor and
20725+
subsequently incorporated within the Work.
20726+
20727+
2. Grant of Copyright License. Subject to the terms and conditions of
20728+
this License, each Contributor hereby grants to You a perpetual,
20729+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
20730+
copyright license to reproduce, prepare Derivative Works of,
20731+
publicly display, publicly perform, sublicense, and distribute the
20732+
Work and such Derivative Works in Source or Object form.
20733+
20734+
3. Grant of Patent License. Subject to the terms and conditions of
20735+
this License, each Contributor hereby grants to You a perpetual,
20736+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
20737+
(except as stated in this section) patent license to make, have made,
20738+
use, offer to sell, sell, import, and otherwise transfer the Work,
20739+
where such license applies only to those patent claims licensable
20740+
by such Contributor that are necessarily infringed by their
20741+
Contribution(s) alone or by combination of their Contribution(s)
20742+
with the Work to which such Contribution(s) was submitted. If You
20743+
institute patent litigation against any entity (including a
20744+
cross-claim or counterclaim in a lawsuit) alleging that the Work
20745+
or a Contribution incorporated within the Work constitutes direct
20746+
or contributory patent infringement, then any patent licenses
20747+
granted to You under this License for that Work shall terminate
20748+
as of the date such litigation is filed.
20749+
20750+
4. Redistribution. You may reproduce and distribute copies of the
20751+
Work or Derivative Works thereof in any medium, with or without
20752+
modifications, and in Source or Object form, provided that You
20753+
meet the following conditions:
20754+
20755+
(a) You must give any other recipients of the Work or
20756+
Derivative Works a copy of this License; and
20757+
20758+
(b) You must cause any modified files to carry prominent notices
20759+
stating that You changed the files; and
20760+
20761+
(c) You must retain, in the Source form of any Derivative Works
20762+
that You distribute, all copyright, patent, trademark, and
20763+
attribution notices from the Source form of the Work,
20764+
excluding those notices that do not pertain to any part of
20765+
the Derivative Works; and
20766+
20767+
(d) If the Work includes a "NOTICE" text file as part of its
20768+
distribution, then any Derivative Works that You distribute must
20769+
include a readable copy of the attribution notices contained
20770+
within such NOTICE file, excluding those notices that do not
20771+
pertain to any part of the Derivative Works, in at least one
20772+
of the following places: within a NOTICE text file distributed
20773+
as part of the Derivative Works; within the Source form or
20774+
documentation, if provided along with the Derivative Works; or,
20775+
within a display generated by the Derivative Works, if and
20776+
wherever such third-party notices normally appear. The contents
20777+
of the NOTICE file are for informational purposes only and
20778+
do not modify the License. You may add Your own attribution
20779+
notices within Derivative Works that You distribute, alongside
20780+
or as an addendum to the NOTICE text from the Work, provided
20781+
that such additional attribution notices cannot be construed
20782+
as modifying the License.
20783+
20784+
You may add Your own copyright statement to Your modifications and
20785+
may provide additional or different license terms and conditions
20786+
for use, reproduction, or distribution of Your modifications, or
20787+
for any such Derivative Works as a whole, provided Your use,
20788+
reproduction, and distribution of the Work otherwise complies with
20789+
the conditions stated in this License.
20790+
20791+
5. Submission of Contributions. Unless You explicitly state otherwise,
20792+
any Contribution intentionally submitted for inclusion in the Work
20793+
by You to the Licensor shall be under the terms and conditions of
20794+
this License, without any additional terms or conditions.
20795+
Notwithstanding the above, nothing herein shall supersede or modify
20796+
the terms of any separate license agreement you may have executed
20797+
with Licensor regarding such Contributions.
20798+
20799+
6. Trademarks. This License does not grant permission to use the trade
20800+
names, trademarks, service marks, or product names of the Licensor,
20801+
except as required for reasonable and customary use in describing the
20802+
origin of the Work and reproducing the content of the NOTICE file.
20803+
20804+
7. Disclaimer of Warranty. Unless required by applicable law or
20805+
agreed to in writing, Licensor provides the Work (and each
20806+
Contributor provides its Contributions) on an "AS IS" BASIS,
20807+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
20808+
implied, including, without limitation, any warranties or conditions
20809+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
20810+
PARTICULAR PURPOSE. You are solely responsible for determining the
20811+
appropriateness of using or redistributing the Work and assume any
20812+
risks associated with Your exercise of permissions under this License.
20813+
20814+
8. Limitation of Liability. In no event and under no legal theory,
20815+
whether in tort (including negligence), contract, or otherwise,
20816+
unless required by applicable law (such as deliberate and grossly
20817+
negligent acts) or agreed to in writing, shall any Contributor be
20818+
liable to You for damages, including any direct, indirect, special,
20819+
incidental, or consequential damages of any character arising as a
20820+
result of this License or out of the use or inability to use the
20821+
Work (including but not limited to damages for loss of goodwill,
20822+
work stoppage, computer failure or malfunction, or any and all
20823+
other commercial damages or losses), even if such Contributor
20824+
has been advised of the possibility of such damages.
20825+
20826+
9. Accepting Warranty or Additional Liability. While redistributing
20827+
the Work or Derivative Works thereof, You may choose to offer,
20828+
and charge a fee for, acceptance of support, warranty, indemnity,
20829+
or other liability obligations and/or rights consistent with this
20830+
License. However, in accepting such obligations, You may act only
20831+
on Your own behalf and on Your sole responsibility, not on behalf
20832+
of any other Contributor, and only if You agree to indemnify,
20833+
defend, and hold each Contributor harmless for any liability
20834+
incurred by, or claims asserted against, such Contributor by reason
20835+
of your accepting any such warranty or additional liability.
20836+
20837+
END OF TERMS AND CONDITIONS
20838+
20839+
APPENDIX: How to apply the Apache License to your work.
20840+
20841+
To apply the Apache License to your work, attach the following
20842+
boilerplate notice, with the fields enclosed by brackets "[]"
20843+
replaced with your own identifying information. (Don't include
20844+
the brackets!) The text should be enclosed in the appropriate
20845+
comment syntax for the file format. We also recommend that a
20846+
file or class name and description of purpose be included on the
20847+
same "printed page" as the copyright notice for easier
20848+
identification within third-party archives.
20849+
20850+
Copyright [yyyy] [name of copyright owner]
20851+
20852+
Licensed under the Apache License, Version 2.0 (the "License");
20853+
you may not use this file except in compliance with the License.
20854+
You may obtain a copy of the License at
20855+
20856+
http://www.apache.org/licenses/LICENSE-2.0
20857+
20858+
Unless required by applicable law or agreed to in writing, software
20859+
distributed under the License is distributed on an "AS IS" BASIS,
20860+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
20861+
See the License for the specific language governing permissions and
20862+
limitations under the License.
20863+
20864+
```
20865+
20866+
2065720867
## go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
2065820868

2065920869
**License:** Apache-2.0

go.mod

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/containerd/platforms v0.2.1
1818
github.com/containernetworking/cni v1.2.3
1919
github.com/containernetworking/plugins v1.6.2
20-
github.com/containers/image/v5 v5.33.0
20+
github.com/containers/image/v5 v5.33.1
2121
github.com/coreos/go-systemd/v22 v22.5.0
2222
github.com/cyphar/filepath-securejoin v0.3.6
2323
github.com/docker/cli v27.5.0+incompatible
@@ -27,7 +27,7 @@ require (
2727
github.com/fatih/color v1.18.0
2828
github.com/go-log/log v0.2.0
2929
github.com/gofrs/flock v0.12.1
30-
github.com/google/go-containerregistry v0.20.2
30+
github.com/google/go-containerregistry v0.20.3
3131
github.com/google/uuid v1.6.0
3232
github.com/gosimple/slug v1.15.0
3333
github.com/moby/buildkit v0.18.2
@@ -99,12 +99,12 @@ require (
9999
github.com/containerd/go-cni v1.1.10 // indirect
100100
github.com/containerd/log v0.1.0 // indirect
101101
github.com/containerd/nydus-snapshotter v0.14.0 // indirect
102-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
102+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
103103
github.com/containerd/ttrpc v1.2.5 // indirect
104104
github.com/containerd/typeurl/v2 v2.2.3 // indirect
105-
github.com/containers/storage v1.56.0 // indirect
105+
github.com/containers/storage v1.56.1 // indirect
106106
github.com/coreos/go-iptables v0.8.0 // indirect
107-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
107+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
108108
github.com/creack/pty v1.1.23 // indirect
109109
github.com/distribution/reference v0.6.0 // indirect
110110
github.com/docker/docker-credential-helpers v0.8.2 // indirect
@@ -127,7 +127,7 @@ require (
127127
github.com/gorilla/mux v1.8.1 // indirect
128128
github.com/gorilla/websocket v1.5.3 // indirect
129129
github.com/gosimple/unidecode v1.0.1 // indirect
130-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
130+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
131131
github.com/hashicorp/errwrap v1.1.0 // indirect
132132
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
133133
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
@@ -198,28 +198,29 @@ require (
198198
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
199199
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
200200
go.opencensus.io v0.24.0 // indirect
201+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
201202
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
202203
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
203-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
204-
go.opentelemetry.io/otel v1.31.0 // indirect
204+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
205+
go.opentelemetry.io/otel v1.33.0 // indirect
205206
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
206207
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
207-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
208+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
208209
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
209-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
210-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
211-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
210+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
211+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
212+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
212213
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
213-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
214-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
214+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
215+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
215216
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
216-
golang.org/x/mod v0.21.0 // indirect
217-
golang.org/x/net v0.30.0 // indirect
217+
golang.org/x/mod v0.22.0 // indirect
218+
golang.org/x/net v0.32.0 // indirect
218219
golang.org/x/time v0.6.0 // indirect
219220
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
220-
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
221-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
222-
google.golang.org/protobuf v1.35.2 // indirect
221+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
222+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
223+
google.golang.org/protobuf v1.36.3 // indirect
223224
gopkg.in/yaml.v2 v2.4.0 // indirect
224225
sigs.k8s.io/knftables v0.0.18 // indirect
225226
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)