github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2026-07-12 18:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	api/Dockerfile
This commit is contained in:
RamiBerm
2021-04-28 17:50:52 +03:00
parent 652df03351 00949d885a
commit 175175e5ee
15 changed files with 158 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/Dockerfile
View File

@@ -31,6 +31,7 @@ WORKDIR /app
# Copy binary and config files from /build to root folder of scratch container.
COPY --from=builder ["/api-build/apiserver", "."]
COPY --from=builder ["/tap-build/passivetapper", "."]
COPY scripts/multi-runner.sh ./
# this script runs both apiserver and passivetapper and exits either if one of them exits, preventing a scenario where the container runs without one process