Compare commits

...

6 Commits

Author SHA1 Message Date
Cedric Verstraeten
926f9ea32c ping Kerberos Vault if attached (was no longer working) 2023-02-03 20:25:00 +01:00
Cedric Verstraeten
43d12ee82f increase network timeout 2023-02-03 12:19:42 +01:00
Cedric Verstraeten
677c985b3d get rid of yarn.lock 2023-02-03 11:53:06 +01:00
Cedric Verstraeten
24a5ca04ca upgrade 2023-02-03 11:37:16 +01:00
Cedric Verstraeten
f81ae57395 do an update and upgrade 2023-02-03 09:28:08 +01:00
Cedric Verstraeten
7e6b69819e upgrade node build-ui image 2023-02-03 08:56:56 +01:00
2 changed files with 7 additions and 4 deletions

View File

@@ -69,14 +69,17 @@ RUN cd /tmp && git clone https://github.com/axiomatic-systems/Bento4 && cd Bento
mv /tmp/Bento4/Build/mp4fragment /dist/agent/ && \
rm -rf /tmp/Bento4
FROM node:16.13.0-alpine3.11 AS build-ui
FROM node:18.14.0-alpine3.16 AS build-ui
RUN apk update && apk upgrade --available && sync
########################
# Build Web (React app)
RUN mkdir -p /go/src/github.com/kerberos-io/agent/machinery/www
COPY ui /go/src/github.com/kerberos-io/agent/ui
RUN cd /go/src/github.com/kerberos-io/agent/ui && yarn && yarn build
RUN cd /go/src/github.com/kerberos-io/agent/ui && rm -rf yarn.lock && yarn config set network-timeout 300000 && \
yarn && yarn build
####################################
# Let's create a /dist folder containing just the files necessary for runtime.

View File

@@ -171,7 +171,6 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
username = config.KStorage.Directory
vaultURI = config.KStorage.URI
}
// This is the new way ;)
@@ -270,8 +269,9 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Hub.")
}
// If we have a vault connect, we will also send some analytics
// If we have a Kerberos Vault connected, we will also send some analytics
// to that service.
vaultURI = config.KStorage.URI
if vaultURI != "" {
buffy = bytes.NewBuffer(jsonStr)
req, _ = http.NewRequest("POST", vaultURI+"/devices/heartbeat", buffy)