Compare commits

..

No commits in common. "master" and "v1.20.9" have entirely different histories.

11 changed files with 15 additions and 28 deletions

View File

@ -10,13 +10,15 @@ COPY . .
RUN echo $PATH;export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' && \
go mod init arm.com/smarter-device-management && go mod tidy && go mod vendor && \
CGO_ENABLED=0 go build -ldflags='-s -w -extldflags="-static"' .
go build -ldflags="-s -w" .
FROM scratch
FROM alpine
RUN apk update && apk upgrade
WORKDIR /root
COPY conf.yaml /root/config/conf.yaml
COPY --from=build /arm.com/smarter-device-management/smarter-device-management /usr/bin/smarter-device-management
CMD ["/usr/bin/smarter-device-management","-logtostderr=true","-v=0"]
CMD ["smarter-device-management","-logtostderr=true","-v=0"]

17
main.go
View File

@ -93,22 +93,7 @@ func readDevDirectory(dirToList string, allowedRecursions uint8) (files []string
}
func sanitizeName(path string) string {
sanitizeChar := func(r rune) rune {
switch {
case r >= 'A' && r <= 'Z':
return r
case r >= 'a' && r <= 'z':
return r
case r >= '0' && r <= '9':
return r
case r == '_':
return r
case r == '-':
return r
}
return '_'
}
return strings.Map(sanitizeChar, path)
return strings.Replace(path, "/!@#$%^&*()[]{}'`~.", "___________________",-1)
}
func findDevicesPattern(listDevices []string, pattern string) ([]string,error) {

View File

@ -15,7 +15,7 @@ spec:
nodeName: smarter-jetson-xavier-4bcc2584
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -15,7 +15,7 @@ spec:
nodeName: <replace with node to run>
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -15,7 +15,7 @@ spec:
nodeName: <replace with node to run>
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false

View File

@ -34,7 +34,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: smarter-device-manager
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.11
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false