fix some container and build issues (#200)

* upgrade to latest gocui, fixes mouse bug when run from container

* fix pktvisor-cli docker build and runtime

* rename pktvisord-slim docker image to pktvisord

* add option to run only version code

Author: weyrick

.github/workflows/static_build.yml

@@ -49,17 +49,17 @@ jobs:
         run: echo ${{ env.VERSION }}
 
       - name: Generate ref tag (master)
-        if: github.event_name != 'pull_request' && ${{ env.BRANCH_NAME == 'master' }}
+        if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'master'
         run: |
           echo "REF_TAG=latest" >> $GITHUB_ENV
 
       - name: Generate ref tag (develop)
-        if: github.event_name != 'pull_request' && ${{ env.BRANCH_NAME == 'develop' }}
+        if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'develop'
         run: |
           echo "REF_TAG=latest-develop" >> $GITHUB_ENV
 
       - name: Generate ref tag (release candidate)
-        if: github.event_name != 'pull_request' && ${{ env.BRANCH_NAME == 'release' }}
+        if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'release'
         run: |
           echo "REF_TAG=latest-rc" >> $GITHUB_ENV
 
@@ -78,7 +78,7 @@ jobs:
         if: github.event_name != 'pull_request'
         env:
           BASE_BINARY: pktvisord
-          IMAGE_NAME: ns1labs/pktvisord-slim
+          IMAGE_NAME: ns1labs/pktvisord
         run: |
           docker build -f docker/Dockerfile.${{ env.BASE_BINARY }}-static -t ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} .
           docker push -a ${{ env.IMAGE_NAME }}
@@ -88,7 +88,7 @@ jobs:
         if: github.event_name != 'pull_request'
         env:
           BASE_BINARY: pktvisord
-          IMAGE_NAME: ns1labs/pktvisord-slim
+          IMAGE_NAME: ns1labs/pktvisord
         run: |
           docker cp ${{ env.CONT_ID }}:/${{ env.BASE_BINARY }} ${{github.workspace}}/${{ env.BASE_BINARY }}-linux-x86_64-${{ env.VERSION }}
 

CMakeLists.txt

@@ -34,15 +34,20 @@ if(VISOR_PRERELEASE STREQUAL "-develop" OR VISOR_PRERELEASE STREQUAL "-rc")
     string(APPEND VISOR_PRERELEASE "-${SHORT_HASH}")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
 # these are computed
 set(VISOR_VERSION_NUM "${PROJECT_VERSION}${VISOR_PRERELEASE}")
 set(VISOR_VERSION "pktvisor ${PROJECT_VERSION}${VISOR_PRERELEASE}")
 
 # used in CI
 file(WRITE ${CMAKE_BINARY_DIR}/VERSION ${VISOR_VERSION_NUM})
-######
+# golang version
+configure_file(golang/pkg/client/version.go.in ${CMAKE_SOURCE_DIR}/golang/pkg/client/version.go)
+
+####### end version code #######
+
+if(NOT DEFINED ENV{VERSION_ONLY})
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -127,5 +132,4 @@ add_subdirectory(src)
 add_subdirectory(cmd)
 add_subdirectory(integration_tests)
 
-# golang version
-configure_file(golang/pkg/client/version.go.in ${CMAKE_SOURCE_DIR}/golang/pkg/client/version.go)
+endif()

docker/Dockerfile.pktvisor-cli

@@ -10,32 +10,23 @@ RUN \
 
 # need git for current hash for VERSION
 COPY ./.git/ /pktvisor-src/.git/
-COPY ./src/ /pktvisor-src/src/
-COPY ./cmd/ /pktvisor-src/cmd/
-COPY ./3rd/ /pktvisor-src/3rd/
 COPY ./golang/ /pktvisor-src/golang/
-COPY ./integration_tests/ /pktvisor-src/integration_tests/
-COPY ./cmake/ /pktvisor-src/cmake/
 COPY ./CMakeLists.txt /pktvisor-src/
-COPY ./conanfile.txt /pktvisor-src/
 
 WORKDIR /tmp/build
-RUN \
-    conan profile new --detect default && \
-    conan profile update settings.compiler.libcxx=libstdc++11 default && \
-    conan config set general.revisions_enabled=1
 
 # ONLY run cmake configure to get version need for go build (no c++ build)
-RUN cmake -DCMAKE_BUILD_TYPE=Release /pktvisor-src
+RUN VERSION_ONLY=1 cmake /pktvisor-src
 
 FROM golang:latest AS gobuild
 COPY golang/ /src/
 WORKDIR /src/
 COPY --from=cppbuild /pktvisor-src/golang/pkg/client/version.go /src/pkg/client/version.go
-RUN go build -o pktvisor-cli cmd/pktvisor-cli/main.go
+RUN CGO_ENABLED=0 go build -o pktvisor-cli cmd/pktvisor-cli/main.go
 
-FROM scratch AS runtime
+FROM alpine:latest AS runtime
 
 COPY --from=gobuild /src/pktvisor-cli /pktvisor-cli
+COPY docker/entry-cli.sh /
 
-ENTRYPOINT [ "/pktvisor-cli" ]
+ENTRYPOINT [ "/entry-cli.sh" ]

docker/entry-cli.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# this is the entry point to the docker container, and is only used there
+set -e
+export PATH=$PATH:/usr/local/bin/:/usr/local/sbin/
+
+# Add sleep to allow tty to be ready for Docker when using -it
+echo "starting pktvisor-cli..."
+sleep 1
+
+exec /pktvisor-cli

golang/go.mod

@@ -3,8 +3,7 @@ module pktvisor
 go 1.15
 
 require (
-	github.com/jroimartin/gocui v0.4.0
+	github.com/jroimartin/gocui v0.5.0
 	github.com/mitchellh/mapstructure v1.4.2
-	github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 // indirect
 	github.com/pkg/errors v0.9.1
 )

golang/go.sum

@@ -1,10 +1,10 @@
-github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
-github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
+github.com/jroimartin/gocui v0.5.0 h1:DCZc97zY9dMnHXJSJLLmx9VqiEnAj0yh0eTNpuEtG/4=
+github.com/jroimartin/gocui v0.5.0/go.mod h1:l7Hz8DoYoL6NoYnlnaX6XCNR62G7J5FfSW5jEogzaxE=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
 github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 h1:Rl8NelBe+n7SuLbJyw13ho7CGWUt2BjGGKIoreCWQ/c=
-github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=