Skip to content

Commit cfad15b

Browse files
Luke-ParkinLuke-Parkin
authored
Merge branch 'main' into network-namespaces
2 parents 9649e44 + b033cfd commit cfad15b

9 files changed

Lines changed: 37 additions & 41 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "gomod"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 10
8+
commit-message:
9+
prefix: "chore"
10+
include: "scope"

‎.github/workflows/blackduck.yml‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
push:
55
branches: [main]
66
tags: ["*"]
7-
pull_request:
8-
branches: [main]
9-
workflow_call:
107

118
concurrency:
129
group: blackduck-${{ github.head_ref || github.run_id }}
@@ -16,25 +13,15 @@ jobs:
1613
scan:
1714
name: Black Duck Scan
1815
runs-on: ubuntu-latest
19-
permissions:
20-
contents: read
21-
pull-requests: write
22-
statuses: write
2316
env:
2417
DETECT_PROJECT_NAME: DEML-remoteproc-runtime
25-
PUSH_REPORT_TO_DB: ${{ github.event_name != 'pull_request' }}
2618
steps:
2719
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2820

2921
- name: Set repository reference
3022
run: |
31-
if [ "${{ github.event_name }}" = "pull_request" ]; then
32-
ver_to_reference="${{ github.base_ref }}"
33-
elif [ "${{ github.ref_type }}" = "tag" ]; then
34-
ver_to_reference="${{ github.ref_name }}"
35-
else
36-
ver_to_reference="${{ github.ref_name }}"; ver_to_reference="${ver_to_reference//\//-}"
37-
fi
23+
ver_to_reference="${{ github.ref_name }}"
24+
ver_to_reference="${ver_to_reference//\//-}"
3825
echo "DETECT_PROJECT_VERSION_NAME=$ver_to_reference" >> $GITHUB_ENV
3926
echo "::notice title=Black Duck target::${{ env.DETECT_PROJECT_NAME }} / $ver_to_reference"
4027
@@ -43,8 +30,7 @@ jobs:
4330
with:
4431
blackducksca_url: ${{ vars.BLACKDUCKSCA_URL }}
4532
blackducksca_token: ${{ secrets.BLACKDUCKSCA_TOKEN }}
46-
blackducksca_scan_full: ${{ env.PUSH_REPORT_TO_DB }}
33+
blackducksca_scan_full: true
4734
blackducksca_waitForScan: true
4835
blackducksca_scan_failure_severities: BLOCKER,CRITICAL,MAJOR
49-
blackducksca_prComment_enabled: ${{ github.event_name == 'pull_request' }}
50-
github_token: ${{ github.token }}
36+
blackducksca_prComment_enabled: false

‎cmd/remoteproc-runtime/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var (
1111
)
1212

1313
var createCmd = &cobra.Command{
14-
Use: "create <ID>",
14+
Use: "create <container-id>",
1515
Short: "Create a new container from an OCI bundle",
1616
Args: cobra.ExactArgs(1),
1717
RunE: func(cmd *cobra.Command, args []string) error {

‎cmd/remoteproc-runtime/delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
var forceDelete bool
99

1010
var deleteCmd = &cobra.Command{
11-
Use: "delete <ID>",
11+
Use: "delete <container-id>",
1212
Short: "Delete a container",
1313
Long: "Delete a container. Use --force to delete a running container.",
1414
Args: cobra.ExactArgs(1),

‎cmd/remoteproc-runtime/kill.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
var killCmd = &cobra.Command{
13-
Use: "kill <ID> [SIGNAL]",
13+
Use: "kill <container-id> [SIGNAL]",
1414
Short: "Send a signal to the container process",
1515
Long: "Send a signal to the container process. Supported signals: TERM (15), KILL (9), INT (2). Default is TERM.",
1616
Args: cobra.RangeArgs(1, 2),

‎cmd/remoteproc-runtime/start.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
var startCmd = &cobra.Command{
9-
Use: "start <ID>",
9+
Use: "start <container-id>",
1010
Short: "Start an existing container",
1111
Args: cobra.ExactArgs(1),
1212
RunE: func(cmd *cobra.Command, args []string) error {

‎cmd/remoteproc-runtime/state.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
var stateCmd = &cobra.Command{
12-
Use: "state <ID>",
12+
Use: "state <container-id>",
1313
Short: "Get the state of a container",
1414
Args: cobra.ExactArgs(1),
1515
RunE: func(cmd *cobra.Command, args []string) error {

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ go 1.25.0
44

55
require (
66
github.com/containerd/containerd/api v1.9.0
7-
github.com/containerd/containerd/v2 v2.1.1
7+
github.com/containerd/containerd/v2 v2.1.4
88
github.com/containerd/errdefs v1.0.0
99
github.com/containerd/log v0.1.0
1010
github.com/containerd/plugin v1.0.0
1111
github.com/containerd/ttrpc v1.2.7
1212
github.com/opencontainers/runtime-spec v1.2.1
1313
github.com/sirupsen/logrus v1.9.3
14-
github.com/spf13/cobra v1.9.1
15-
github.com/stretchr/testify v1.10.0
16-
golang.org/x/sys v0.33.0
14+
github.com/spf13/cobra v1.10.1
15+
github.com/stretchr/testify v1.11.1
16+
golang.org/x/sys v0.36.0
1717
)
1818

1919
require (
@@ -39,13 +39,13 @@ require (
3939
github.com/opencontainers/image-spec v1.1.1 // indirect
4040
github.com/pkg/errors v0.9.1 // indirect
4141
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
42-
github.com/spf13/pflag v1.0.6 // indirect
42+
github.com/spf13/pflag v1.0.9 // indirect
4343
go.opencensus.io v0.24.0 // indirect
4444
golang.org/x/net v0.38.0 // indirect
4545
golang.org/x/sync v0.14.0 // indirect
4646
golang.org/x/text v0.23.0 // indirect
4747
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
48-
google.golang.org/grpc v1.72.0 // indirect
48+
google.golang.org/grpc v1.72.2 // indirect
4949
google.golang.org/protobuf v1.36.6 // indirect
5050
gopkg.in/yaml.v3 v3.0.1 // indirect
5151
)

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn
1313
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
1414
github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0=
1515
github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
16-
github.com/containerd/containerd/v2 v2.1.1 h1:znnkm7Ajz8lg8BcIPMhc/9yjBRN3B+OkNKqKisKfwwM=
17-
github.com/containerd/containerd/v2 v2.1.1/go.mod h1:zIfkQj4RIodclYQkX7GSSswSwgP8d/XxDOtOAoSDIGU=
16+
github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ=
17+
github.com/containerd/containerd/v2 v2.1.4/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM=
1818
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
1919
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
2020
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -103,19 +103,19 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
103103
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
104104
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
105105
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
106-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
107-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
108-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
109-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
106+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
107+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
108+
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
109+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
110110
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
111111
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
112112
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
113113
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
114114
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
115115
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
116116
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
117-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
118-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
117+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
118+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
119119
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
120120
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
121121
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
@@ -166,8 +166,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
166166
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
167167
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
168168
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
169-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
170-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
169+
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
170+
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
171171
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
172172
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
173173
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
@@ -196,8 +196,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
196196
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
197197
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
198198
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
199-
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
200-
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
199+
google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
200+
google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
201201
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
202202
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
203203
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)