Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dependabot PRs #702

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7038a98
Bump frolvlad/alpine-glibc in /build/onos-e2t
dependabot[bot] Feb 28, 2024
96a52a5
Bump frolvlad/alpine-glibc in /build/onos-e2t-sim-app
dependabot[bot] Feb 28, 2024
68a8092
Bump github.com/google/uuid from 1.3.0 to 1.6.0
dependabot[bot] Feb 28, 2024
05bf626
Bump github.com/onosproject/onos-api/go from 0.10.22 to 0.10.32 in /test
dependabot[bot] Feb 28, 2024
42181a2
Bump github.com/onosproject/onos-lib-go from 0.10.21 to 0.10.25 in /test
dependabot[bot] Feb 28, 2024
da81eff
Bump onosproject/golang-build in /build/onos-e2t-sim-app
dependabot[bot] Mar 4, 2024
704b8a1
Bump onosproject/golang-build from v1.3.0 to v1.3.1 in /build/onos-e2t
dependabot[bot] Mar 4, 2024
dc0eedc
Bump github.com/stretchr/testify from 1.8.2 to 1.9.0
dependabot[bot] Mar 4, 2024
7cbec29
---
dependabot[bot] May 20, 2024
9d19d9a
Bump google.golang.org/protobuf from 1.28.1 to 1.34.2 in /test
dependabot[bot] Jun 17, 2024
764da25
Bump frolvlad/alpine-glibc in /build/onos-e2t
dependabot[bot] Jun 29, 2024
cf301fb
Bump github.com/onosproject/onos-api/go from 0.10.22 to 0.10.33 in /test
dependabot[bot] Jul 1, 2024
675d594
Bump google.golang.org/grpc from 1.52.3 to 1.65.0 in /test
dependabot[bot] Jul 8, 2024
925cabe
Bump github.com/onosproject/onos-lib-go from 0.10.21 to 0.10.28 in /test
dependabot[bot] Jul 8, 2024
d3a3dcd
Bump github.com/onosproject/onos-api/go from 0.10.22 to 0.10.34 in /test
dependabot[bot] Jul 8, 2024
03f3ff0
Bump github.com/onosproject/onos-lib-go from 0.10.24 to 0.10.28
dependabot[bot] Jul 8, 2024
130978b
Bump github.com/onosproject/onos-api/go from 0.10.31 to 0.10.34
dependabot[bot] Jul 8, 2024
d9c937f
Bump github.com/envoyproxy/protoc-gen-validate from 0.9.1 to 1.0.4
dependabot[bot] Jul 8, 2024
3489014
Merge branch 'dependabot/docker/build/onos-e2t/frolvlad/alpine-glibc-…
sodyn99 Jul 10, 2024
ede839d
650
sodyn99 Jul 10, 2024
b5cb750
Merge branch 'dependabot/docker/build/onos-e2t-sim-app/onosproject/go…
sodyn99 Jul 10, 2024
bb3894c
Merge branch 'dependabot/docker/build/onos-e2t/onosproject/golang-bui…
sodyn99 Jul 10, 2024
01feef9
686
sodyn99 Jul 10, 2024
d735f72
Merge branch 'dependabot/go_modules/github.com/google/uuid-1.6.0' of …
sodyn99 Jul 10, 2024
1c8d050
Merge branch 'dependabot/go_modules/test/github.com/onosproject/onos-…
sodyn99 Jul 10, 2024
02c856f
662
sodyn99 Jul 10, 2024
e05285c
Merge branch 'dependabot/go_modules/github.com/stretchr/testify-1.9.0…
sodyn99 Jul 10, 2024
ee54f37
679
sodyn99 Jul 10, 2024
ead9aa3
682
sodyn99 Jul 10, 2024
683f408
Merge branch 'dependabot/go_modules/test/github.com/onosproject/onos-…
sodyn99 Jul 10, 2024
d75af51
696
sodyn99 Jul 10, 2024
e131112
697
sodyn99 Jul 10, 2024
cd17948
698
sodyn99 Jul 10, 2024
4eab2c0
699
sodyn99 Jul 10, 2024
cf205ee
700
sodyn99 Jul 10, 2024
a9c8075
701
sodyn99 Jul 10, 2024
db119ab
version update
sodyn99 Jul 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.26-dev
0.11.26
29 changes: 29 additions & 0 deletions build/onos-e2t-sim-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# SPDX-FileCopyrightText: 2022 2019-present Open Networking Foundation <[email protected]>
#
# SPDX-License-Identifier: Apache-2.0

FROM onosproject/golang-build:v1.3.1 as build

ENV GO111MODULE=on
ARG ONOS_MAKE_TARGET=build

COPY Makefile go.mod go.sum /build/
COPY cmd/ /build/cmd/
COPY pkg/ /build/pkg/
COPY vendor/ /build/vendor/
COPY sim/ /build/sim
COPY test/ /build/test

WORKDIR /build

RUN GOFLAGS=-mod=vendor make sim-app

# So that dynamically linked modules that depend on glibc can be loaded i.e. the service models
FROM frolvlad/alpine-glibc:alpine-3.19

USER nobody

COPY --from=build /build/build/_output/onos-e2t-sim-app /usr/local/bin/onos-e2t-sim-app
ADD build/onos-e2t-sim-app/logging.yaml logging.yaml

ENTRYPOINT ["onos-e2t-sim-app"]
4 changes: 2 additions & 2 deletions build/onos-e2t/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM onosproject/golang-build:v1.3.0 as build
FROM onosproject/golang-build:v1.3.1 as build


ENV GO111MODULE=on
Expand All @@ -20,7 +20,7 @@ WORKDIR /build
RUN GOFLAGS=-mod=vendor make ${ONOS_MAKE_TARGET}

# So that dynamically linked modules that depend on glibc can be loaded i.e. the service models
FROM frolvlad/alpine-glibc:alpine-3.12
FROM frolvlad/alpine-glibc:alpine-3.20

USER nobody

Expand Down
68 changes: 33 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,43 @@ go 1.19

require (
github.com/atomix/go-sdk v0.13.2
github.com/envoyproxy/protoc-gen-validate v0.9.1
github.com/envoyproxy/protoc-gen-validate v1.0.4
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/google/uuid v1.6.0
github.com/onosproject/onos-api/go v0.10.31
github.com/onosproject/onos-lib-go v0.10.24
github.com/stretchr/testify v1.8.2
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.28.1
github.com/onosproject/onos-lib-go v0.10.28
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
gotest.tools v2.2.0+incompatible
)

require (
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)

require (
github.com/Shopify/sarama v1.31.1 // indirect
github.com/atomix/atomix/api v1.1.0 // indirect
github.com/atomix/atomix/runtime v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/ericchiang/oidc v0.0.0-20160908143337-11f62933e071 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
Expand All @@ -52,30 +50,30 @@ require (
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/klauspost/compress v1.14.2 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.11.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
github.com/spf13/viper v1.19.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v1 v1.1.2 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading