github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-19 13:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Dockerfile and fixed typo in Makefile (#929)

Browse Source 
* Updated Dockerfile and fixed typo in Makefile

* PR request

* added small hotfix to basenine
This commit is contained in:
Adrian Gąsior 2022-03-26 23:39:50 +01:00 committed by GitHub
parent 319c3c7a8d
commit 8d19080c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -6,8 +6,7 @@ FROM node:16 AS front-end
WORKDIR /app/ui-build WORKDIR /app/ui-build
COPY ui/package.json . COPY ui/package.json ui/package-lock.json ./
COPY ui/package-lock.json .
RUN npm i RUN npm i
COPY ui . COPY ui .
RUN npm run build RUN npm run build
@ -15,7 +14,7 @@ RUN npm run build
### Base builder image for native builds architecture ### Base builder image for native builds architecture
FROM golang:1.17-alpine AS builder-native-base FROM golang:1.17-alpine AS builder-native-base
ENV CGO_ENABLED=1 GOOS=linux ENV CGO_ENABLED=1 GOOS=linux
RUN apk add libpcap-dev g++ perl-utils RUN apk add --no-cache libpcap-dev g++ perl-utils
### Intermediate builder image for x86-64 to x86-64 native builds ### Intermediate builder image for x86-64 to x86-64 native builds
@ -79,15 +78,14 @@ RUN go build -ldflags="-extldflags=-static -s -w \
# Download Basenine executable, verify the sha1sum # Download Basenine executable, verify the sha1sum
ADD https://github.com/up9inc/basenine/releases/download/v0.6.6/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH} ADD https://github.com/up9inc/basenine/releases/download/v0.6.6/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH}
ADD https://github.com/up9inc/basenine/releases/download/v0.6.6/basenine_linux_${GOARCH}.sha256 ./basenine_linux_${GOARCH}.sha256 ADD https://github.com/up9inc/basenine/releases/download/v0.6.6/basenine_linux_${GOARCH}.sha256 ./basenine_linux_${GOARCH}.sha256
RUN shasum -a 256 -c basenine_linux_${GOARCH}.sha256
RUN chmod +x ./basenine_linux_${GOARCH}
RUN mv ./basenine_linux_${GOARCH} ./basenine
RUN shasum -a 256 -c basenine_linux_"${GOARCH}".sha256 && \
chmod +x ./basenine_linux_"${GOARCH}" && \
mv ./basenine_linux_"${GOARCH}" ./basenine
### The shipped image ### The shipped image
ARG TARGETARCH=amd64 ARG TARGETARCH=amd64
FROM ${TARGETARCH}/busybox:latest FROM ${TARGETARCH}/busybox:latest
# gin-gonic runs in debug mode without this # gin-gonic runs in debug mode without this
ENV GIN_MODE=release ENV GIN_MODE=release

2
Makefile
View File

@ -73,7 +73,7 @@ clean-agent: ## Clean agent.
clean-cli: ## Clean CLI. clean-cli: ## Clean CLI.
@(cd cli; make clean ; echo "CLI cleanup done" ) @(cd cli; make clean ; echo "CLI cleanup done" )
clean-docker: ## Run clen docker clean-docker: ## Run clean docker
@(echo "DOCKER cleanup - NOT IMPLEMENTED YET " ) @(echo "DOCKER cleanup - NOT IMPLEMENTED YET " )
test-lint: ## Run lint on all modules test-lint: ## Run lint on all modules