Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Mizu
Commits
43077008
Unverified
Commit
43077008
authored
3 years ago
by
M. Mert Yildiran
Browse files
Options
Download
Email Patches
Plain Diff
Upgrade Basenine to `0.7.0`
parent
1fad1761
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Dockerfile
+4
-4
Dockerfile
agent/go.mod
+2
-2
agent/go.mod
agent/go.sum
+2
-2
agent/go.sum
cli/go.mod
+1
-1
cli/go.mod
cli/go.sum
+2
-2
cli/go.sum
with
11 additions
and
11 deletions
+11
-11
Dockerfile
+
4
-
4
View file @
43077008
...
...
@@ -64,7 +64,6 @@ COPY tap/extensions/amqp/go.mod ../tap/extensions/amqp/
COPY
tap/extensions/http/go.mod ../tap/extensions/http/
COPY
tap/extensions/kafka/go.mod ../tap/extensions/kafka/
COPY
tap/extensions/redis/go.mod ../tap/extensions/redis/
COPY
basenine-go ./basenine-go
RUN
go mod download
# cheap trick to make the build faster (as long as go.mod did not change)
RUN
go list
-f
'{{.Path}}@{{.Version}}'
-m
all |
sed
1d |
grep
-e
'go-cache'
| xargs go get
...
...
@@ -88,10 +87,11 @@ RUN go build -ldflags="-extldflags=-static -s -w \
-X 'github.com/up9inc/mizu/agent/pkg/version.Ver=
${
VER
}
'"
-o
mizuagent .
# Download Basenine executable, verify the sha1sum
COPY
./basenine_linux_${GOARCH} ./basenine_linux_${GOARCH}
ADD
https://github.com/up9inc/basenine/releases/download/v0.7.0/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH}
ADD
https://github.com/up9inc/basenine/releases/download/v0.7.0/basenine_linux_${GOARCH}.sha256 ./basenine_linux_${GOARCH}.sha256
RUN
chmod
+x ./
basenine_linux_
"
${
GOARCH
}
"
&&
\
mv
./basenine_linux_
"
${
GOARCH
}
"
./basenine
RUN
shasum
-a
256
-c
basenine_linux_
"
${
GOARCH
}
"
.sha256
&&
\
chmod
+x
./basenine_linux_
"
${
GOARCH
}
"
&&
\
### The shipped image
ARG
TARGETARCH=amd64
...
...
This diff is collapsed.
Click to expand it.
agent/go.mod
+
2
-
2
View file @
43077008
...
...
@@ -20,7 +20,7 @@ require (
github.com/orcaman/concurrent-map v1.0.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.7.0
github.com/up9inc/basenine/client/go v0.0.0-20220
326121918-785f3061c8ce
github.com/up9inc/basenine/client/go v0.0.0-20220
404203955-0a271e6bcb4a
github.com/up9inc/mizu/shared v0.0.0
github.com/up9inc/mizu/tap v0.0.0
github.com/up9inc/mizu/tap/api v0.0.0
...
...
@@ -149,4 +149,4 @@ replace github.com/up9inc/mizu/tap/extensions/kafka v0.0.0 => ../tap/extensions/
replace github.com/up9inc/mizu/tap/extensions/redis v0.0.0 => ../tap/extensions/redis
replace github.com/up9inc/basenine/client/go v0.0.0-20220326121918-785f3061c8ce =>
.
/basenine
-
go
replace github.com/up9inc/basenine/client/go v0.0.0-20220326121918-785f3061c8ce =>
/home/mertyildiran/Documents/up9
/basenine
/client/
go
This diff is collapsed.
Click to expand it.
agent/go.sum
+
2
-
2
View file @
43077008
...
...
@@ -681,8 +681,8 @@ github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ=
github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
github.com/up9inc/basenine/client/go v0.0.0-20220
326121918-785f3061c8ce h1:vMTCpKItc9OyTLJXocNaq2NcBU5EnurJgTVOYb8W8d
w=
github.com/up9inc/basenine/client/go v0.0.0-20220
326121918-785f3061c8ce
/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI=
github.com/up9inc/basenine/client/go v0.0.0-20220
404203955-0a271e6bcb4a h1:d+DslaVdWVxktKcrHRMwu/wcv7uuQ4ym314Eo9avpf
w=
github.com/up9inc/basenine/client/go v0.0.0-20220
404203955-0a271e6bcb4a
/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI=
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
github.com/wI2L/jsondiff v0.1.1 h1:r2TkoEet7E4JMO5+s1RCY2R0LrNPNHY6hbDeow2hRHw=
...
...
This diff is collapsed.
Click to expand it.
cli/go.mod
+
1
-
1
View file @
43077008
...
...
@@ -11,7 +11,7 @@ require (
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/spf13/cobra v1.3.0
github.com/spf13/pflag v1.0.5
github.com/up9inc/basenine/server/lib v0.0.0-20220
326121918-785f3061c8ce
github.com/up9inc/basenine/server/lib v0.0.0-20220
404203955-0a271e6bcb4a
github.com/up9inc/mizu/shared v0.0.0
github.com/up9inc/mizu/tap/api v0.0.0
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
...
...
This diff is collapsed.
Click to expand it.
cli/go.sum
+
2
-
2
View file @
43077008
...
...
@@ -600,8 +600,8 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/up9inc/basenine/server/lib v0.0.0-20220
326121918-785f3061c8ce h1:PypqybjmuxftGkX4NmP4JAUyEykZj2r6W4r9lnRZ/kE
=
github.com/up9inc/basenine/server/lib v0.0.0-20220
326121918-785f3061c8ce
/go.mod h1:ZIkxWiJm65jYQIso9k+OZKhR7gQ1we2jNyE2kQX9IQI=
github.com/up9inc/basenine/server/lib v0.0.0-20220
404203955-0a271e6bcb4a h1:f+e+IyirWQX/R9LL+RZVSHa2gf3hMQIEoPenvj1pstI
=
github.com/up9inc/basenine/server/lib v0.0.0-20220
404203955-0a271e6bcb4a
/go.mod h1:ZIkxWiJm65jYQIso9k+OZKhR7gQ1we2jNyE2kQX9IQI=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment