From 825afa90c82158b009ca6be980ad8c2c7f333787 Mon Sep 17 00:00:00 2001
From: cruisibesares <cruisibesares@nsone.net>
Date: Tue, 30 Mar 2021 14:57:22 -0600
Subject: [PATCH 1/4] Setup AppImage packaging.

This is a POC to show the ability to package pktvisor as an AppImage. If
we want to build this out for other archs we probably should look into
additional tooling.
---
 .dockerignore                                 |   5 +++
 .gitignore                                    |   1 +
 appimage/Dockerfile.part                      |  18 ++++++++++
 appimage/Makefile                             |  15 +++++++++
 appimage/export.sh                            |  28 ++++++++++++++++
 appimage/pktvisor/AppRun                      |  31 ++++++++++++++++++
 .../pktvisor/TerminalEmulatorRequired.txt     |   1 +
 appimage/pktvisor/pktvisor.desktop            |   8 +++++
 appimage/pktvisor/pktvisor.png                | Bin 0 -> 15076 bytes
 docker/Dockerfile                             |   1 +
 10 files changed, 108 insertions(+)
 create mode 100644 appimage/Dockerfile.part
 create mode 100644 appimage/Makefile
 create mode 100644 appimage/export.sh
 create mode 100644 appimage/pktvisor/AppRun
 create mode 100644 appimage/pktvisor/TerminalEmulatorRequired.txt
 create mode 100644 appimage/pktvisor/pktvisor.desktop
 create mode 100644 appimage/pktvisor/pktvisor.png

diff --git a/.dockerignore b/.dockerignore
index c4ab83c6e..919a15e1c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,8 @@ cmake-build*
 integration_tests/external*
 Dockerfile
 .dockerignore
+.gitignore
+.git
+appimage/Dockerfile.part
+appimage/export.sh
+appimage/Makefile
diff --git a/.gitignore b/.gitignore
index c4fb154b5..82dd8837c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ docs/html-documentation-generated*
 integration_tests/external
 golang/pkg/client/version.go
 docs/internals/html
+appimage/*.AppImage
\ No newline at end of file
diff --git a/appimage/Dockerfile.part b/appimage/Dockerfile.part
new file mode 100644
index 000000000..a162f194f
--- /dev/null
+++ b/appimage/Dockerfile.part
@@ -0,0 +1,18 @@
+# file is needed for appimagetool when its run with --appimage-extract-and-run
+# binutil is needed for strip
+RUN apt-get update && apt-get install -yqq --no-install-recommends python3-pip binutils file dietlibc-dev gcc musl musl-tools \
+	&& pip3 install --user exodus-bundler --no-warn-script-location \
+	&& /root/.local/bin/exodus --verbose --tarball --output=/tmp/pktvisor.tgz $(which pktvisord) $(which pktvisor-pcap) \
+	&& mkdir pktvisor \
+	&& tar --strip=1 -xf /tmp/pktvisor.tgz -C pktvisor/ \
+	&& strip --verbose --strip-debug pktvisor/data/* \
+	&& cp $(which pktvisor-cli) /pktvisor/bin/pktvisor-cli
+
+# get latest appimagetool
+ADD https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage /bin/appimage-tool
+
+# add entrypoints and desktop things
+COPY appimage/pktvisor /pktvisor
+
+# create appimage without fuse
+RUN chmod +x /bin/appimage-tool /pktvisor/AppRun && appimage-tool --appimage-extract-and-run /pktvisor/
\ No newline at end of file
diff --git a/appimage/Makefile b/appimage/Makefile
new file mode 100644
index 000000000..6a9f449f6
--- /dev/null
+++ b/appimage/Makefile
@@ -0,0 +1,15 @@
+# in dev mode we just use the latest image
+ifneq ($(strip $(DEV_MODE)),)
+DEV_MODE := <(echo "FROM ns1labs/pktvisor:latest") appimage/Dockerfile.part
+endif
+
+BUILD_FILES := docker/Dockerfile appimage/Dockerfile.part
+
+pktvisor-x86_64.AppImage: SHELL:=/bin/bash
+pktvisor-x86_64.AppImage:
+	ID=$$(cd .. && cat $(if $(DEV_MODE),$(DEV_MODE),$(BUILD_FILES)) | docker build -q -f- .) ; \
+	bash export.sh $$ID
+
+.PHONEY: clean
+clean:
+	rm pktvisor-x86_64.AppImage
\ No newline at end of file
diff --git a/appimage/export.sh b/appimage/export.sh
new file mode 100644
index 000000000..7bb01f5ab
--- /dev/null
+++ b/appimage/export.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+FILES=(pktvisor-x86_64.AppImage)
+
+die () {
+	echo "$@" >&2
+	exit 1
+}
+
+main () {
+	[[ $1 ]] || die "image name not specified"
+	
+	id=
+	cleanup() {
+		docker rm -v "$id"
+	}
+
+	trap cleanup EXIT
+
+	id=$(docker create $1)
+	[[ $? == 0 ]] || die "failed to create container for export"
+	
+	for file in "${FILES[@]}" ; do
+		docker cp "$id:$file" .
+	done
+}
+
+main "$1"
\ No newline at end of file
diff --git a/appimage/pktvisor/AppRun b/appimage/pktvisor/AppRun
new file mode 100644
index 000000000..9678a18a7
--- /dev/null
+++ b/appimage/pktvisor/AppRun
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -x
+
+# borrowed from appimage directly
+SELF=$(readlink -f "$0")
+HERE=${SELF%/*}
+export PATH="${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
+export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
+export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
+
+# begin entrypoint
+# default to pktvisord but allow first arg to specify binary
+BINARY="$1"
+case "$BINARY" in
+	pktvisor-cli) shift ;;
+	pktvisor-pcap) shift ;;
+	pktvisord) shift ;;
+	*) BINARY=pktvisord ;;
+esac
+
+# not a terminal
+if [ ! -t 1 ] ; then
+	xdg-open "file://${HERE}/TerminalEmulatorRequired.txt"
+	exit 1
+else
+	exec "${HERE}/bin/${BINARY}" "$@"
+fi
\ No newline at end of file
diff --git a/appimage/pktvisor/TerminalEmulatorRequired.txt b/appimage/pktvisor/TerminalEmulatorRequired.txt
new file mode 100644
index 000000000..f463044a7
--- /dev/null
+++ b/appimage/pktvisor/TerminalEmulatorRequired.txt
@@ -0,0 +1 @@
+This app needs to be run from a terminal to function correctly. See the docs at https://github.com/ns1/pktvisor for more details.
\ No newline at end of file
diff --git a/appimage/pktvisor/pktvisor.desktop b/appimage/pktvisor/pktvisor.desktop
new file mode 100644
index 000000000..346c67e78
--- /dev/null
+++ b/appimage/pktvisor/pktvisor.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=pktvisor
+Terminal=true
+Exec=AppRun
+Comment=Test the terminal running a command inside it
+Icon=pktvisor
+Type=Application
+Categories=Utility;
\ No newline at end of file
diff --git a/appimage/pktvisor/pktvisor.png b/appimage/pktvisor/pktvisor.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5a78ad089e9b5f83bd7eda7d67b023e5e2f2dbb
GIT binary patch
literal 15076
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

literal 0
HcmV?d00001

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fb84acdd8..d7a210456 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,6 +21,7 @@ RUN \
 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
 
 FROM debian:bullseye-slim AS runtime

From 46a62e3fbe1b550622b443e6df20b0d5a7d767bd Mon Sep 17 00:00:00 2001
From: cruisibesares <cruisibesares@nsone.net>
Date: Tue, 30 Mar 2021 17:15:55 -0600
Subject: [PATCH 2/4] Adding Readme to AppImage

---
 appimage/Readme.md       | 24 ++++++++++++++++++++++++
 appimage/pktvisor/AppRun |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 appimage/Readme.md

diff --git a/appimage/Readme.md b/appimage/Readme.md
new file mode 100644
index 000000000..0f7f06db4
--- /dev/null
+++ b/appimage/Readme.md
@@ -0,0 +1,24 @@
+AppImage Packaging
+==================
+
+Creates an AppImage that contains `pktvisord` `pktvisor-pcap` and `pktvisor-cli`. This implementation builds the AppImage in a docker using the assets generated by the docker [build](../docker). Because not all of the assets are statically complied we use [Exodus](https://github.com/intoli/exodus) to capture a minimal set of decencies for the AppImage 
+
+
+## Build:
+`make pktvisor-x86_64.AppImage`
+
+## Development:
+Because the build can take a while you may want to build the appimage from the latest docker image on docker hub. To do this you can set the `DEV_MODE=` environment to anything. Like so:
+
+`DEV_MODE=t make pktvisor-x86_64.AppImage`
+
+
+## Usage:
+To use the AppImage from the command line you can specify the binary you want to run as the first argument following the pattern:
+
+`
+./pktvisor-x86_64.AppImage [pktvisord|pktvisor-pcap|pktvisor-cli] <args>
+`
+
+If you don't specify all args are passed to `pktvisord` by default.
+
diff --git a/appimage/pktvisor/AppRun b/appimage/pktvisor/AppRun
index 9678a18a7..a08924b64 100644
--- a/appimage/pktvisor/AppRun
+++ b/appimage/pktvisor/AppRun
@@ -22,7 +22,7 @@ case "$BINARY" in
 	*) BINARY=pktvisord ;;
 esac
 
-# not a terminal
+# not a terminal try to alert the user
 if [ ! -t 1 ] ; then
 	xdg-open "file://${HERE}/TerminalEmulatorRequired.txt"
 	exit 1

From 7d1b6107784fedeb06ca144c940e0415cdad7c98 Mon Sep 17 00:00:00 2001
From: cruisibesares <cruisibesares@nsone.net>
Date: Tue, 30 Mar 2021 17:37:12 -0600
Subject: [PATCH 3/4] Final cleanup and comments.

---
 appimage/Makefile                  | 12 ++++++------
 appimage/export.sh                 |  8 ++++++++
 appimage/pktvisor/pktvisor.desktop |  1 -
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/appimage/Makefile b/appimage/Makefile
index 6a9f449f6..7ad89cb8f 100644
--- a/appimage/Makefile
+++ b/appimage/Makefile
@@ -1,13 +1,13 @@
-# in dev mode we just use the latest image
+# in dev mode we just use the latest image as the start point
 ifneq ($(strip $(DEV_MODE)),)
-DEV_MODE := <(echo "FROM ns1labs/pktvisor:latest") appimage/Dockerfile.part
+DOCKERFILE_HEAD = <(echo "FROM ns1labs/pktvisor:latest")
+else
+DOCKERFILE_HEAD = docker/Dockerfile
 endif
 
-BUILD_FILES := docker/Dockerfile appimage/Dockerfile.part
-
-pktvisor-x86_64.AppImage: SHELL:=/bin/bash
+pktvisor-x86_64.AppImage: SHELL:=/bin/bash #needed for the fd when DOCKERFILE_HEAD is in DEV_MODE
 pktvisor-x86_64.AppImage:
-	ID=$$(cd .. && cat $(if $(DEV_MODE),$(DEV_MODE),$(BUILD_FILES)) | docker build -q -f- .) ; \
+	ID=$$(cd .. && cat $(DOCKERFILE_HEAD) appimage/Dockerfile.part | docker build -q -f- .) ; \
 	bash export.sh $$ID
 
 .PHONEY: clean
diff --git a/appimage/export.sh b/appimage/export.sh
index 7bb01f5ab..00c27ff24 100644
--- a/appimage/export.sh
+++ b/appimage/export.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+##
+# Try to extract files from docker image as atomically as possible
+#
+
 FILES=(pktvisor-x86_64.AppImage)
 
 die () {
@@ -7,9 +11,11 @@ die () {
 	exit 1
 }
 
+# pass in image id as $1
 main () {
 	[[ $1 ]] || die "image name not specified"
 	
+	# make a trap that see the var
 	id=
 	cleanup() {
 		docker rm -v "$id"
@@ -17,9 +23,11 @@ main () {
 
 	trap cleanup EXIT
 
+	# make it
 	id=$(docker create $1)
 	[[ $? == 0 ]] || die "failed to create container for export"
 	
+	# take it
 	for file in "${FILES[@]}" ; do
 		docker cp "$id:$file" .
 	done
diff --git a/appimage/pktvisor/pktvisor.desktop b/appimage/pktvisor/pktvisor.desktop
index 346c67e78..35a4e20b4 100644
--- a/appimage/pktvisor/pktvisor.desktop
+++ b/appimage/pktvisor/pktvisor.desktop
@@ -2,7 +2,6 @@
 Name=pktvisor
 Terminal=true
 Exec=AppRun
-Comment=Test the terminal running a command inside it
 Icon=pktvisor
 Type=Application
 Categories=Utility;
\ No newline at end of file

From b6a34869d5c1f6348a3481641e77c502902b9f67 Mon Sep 17 00:00:00 2001
From: cruisibesares <cruisibesares@nsone.net>
Date: Thu, 8 Apr 2021 10:58:52 -0600
Subject: [PATCH 4/4] Appimage README clarification.

Updating some wording and adding the `DEV_IMAGE` env var to the appimage
build for ease of development.
---
 appimage/Makefile                 | 4 +++-
 appimage/{Readme.md => README.md} | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename appimage/{Readme.md => README.md} (62%)

diff --git a/appimage/Makefile b/appimage/Makefile
index 7ad89cb8f..085a7079c 100644
--- a/appimage/Makefile
+++ b/appimage/Makefile
@@ -1,6 +1,8 @@
+DEV_IMAGE ?= ns1labs/pktvisor:latest
+
 # in dev mode we just use the latest image as the start point
 ifneq ($(strip $(DEV_MODE)),)
-DOCKERFILE_HEAD = <(echo "FROM ns1labs/pktvisor:latest")
+DOCKERFILE_HEAD = <(echo "FROM $(DEV_IMAGE)")
 else
 DOCKERFILE_HEAD = docker/Dockerfile
 endif
diff --git a/appimage/Readme.md b/appimage/README.md
similarity index 62%
rename from appimage/Readme.md
rename to appimage/README.md
index 0f7f06db4..126ca1711 100644
--- a/appimage/Readme.md
+++ b/appimage/README.md
@@ -1,7 +1,7 @@
 AppImage Packaging
 ==================
 
-Creates an AppImage that contains `pktvisord` `pktvisor-pcap` and `pktvisor-cli`. This implementation builds the AppImage in a docker using the assets generated by the docker [build](../docker). Because not all of the assets are statically complied we use [Exodus](https://github.com/intoli/exodus) to capture a minimal set of decencies for the AppImage 
+Creates an AppImage that contains `pktvisord` `pktvisor-pcap` and `pktvisor-cli`. This implementation builds the AppImage in a docker using the assets generated by the docker [build](../docker). Because not all of the assets are statically linked we use [Exodus](https://github.com/intoli/exodus) to capture a minimal set of dependencies for the AppImage 
 
 
 ## Build:
@@ -12,6 +12,10 @@ Because the build can take a while you may want to build the appimage from the l
 
 `DEV_MODE=t make pktvisor-x86_64.AppImage`
 
+You may also specify a custom image in dev mode by setting the env file `DEV_IMAGE=` to the image you wish to build on. Example:
+
+`DEV_IMAGE="ns1labs/pktvisor:develop" DEV_MODE=t make pktvisor-x86_64.AppImage`
+
 
 ## Usage:
 To use the AppImage from the command line you can specify the binary you want to run as the first argument following the pattern:
@@ -20,5 +24,5 @@ To use the AppImage from the command line you can specify the binary you want to
 ./pktvisor-x86_64.AppImage [pktvisord|pktvisor-pcap|pktvisor-cli] <args>
 `
 
-If you don't specify all args are passed to `pktvisord` by default.
+If you don't specify a binary, all args are passed to pktvisord by default.