version 1.0

Author: casperklein

Dockerfile

@@ -6,8 +6,10 @@ ENV	VERSION="0.1.1"
 
 ENV	PACKAGES="python3 python3-pip nmap"
 
+ENV	GIT_USER="lopes"
+ENV	GIT_REPO="netbox-scanner"
 ENV	GIT_COMMIT="438016caea3e975ce2cae34c443d661ee7b66b20"
-ENV	GIT_ARCHIVE="https://github.com/lopes/netbox-scanner/archive/$GIT_COMMIT.tar.gz"
+ENV	GIT_ARCHIVE="https://github.com/$GIT_USER/$GIT_REPO/archive/$GIT_COMMIT.tar.gz"
 
 # Install packages
 RUN	apt-get update \
@@ -17,11 +19,12 @@ RUN	apt-get update \
 # Copy root filesystem
 COPY	rootfs /
 
-# install netbox-scanner
+# Download source
+WORKDIR	/$GIT_REPO
 ADD	$GIT_ARCHIVE /
-WORKDIR	/netbox-scanner
-RUN	tar xzvf /$GIT_COMMIT.tar.gz
-WORKDIR	/netbox-scanner/netbox-scanner-$GIT_COMMIT
+RUN	tar --strip-component 1 -xzvf /$GIT_COMMIT.tar.gz && rm /$GIT_COMMIT.tar.gz
+
+# Install dependencies
 RUN	pip3 install -r requirements.txt
 
 # Cleanup

rootfs/run.sh

@@ -7,4 +7,4 @@ echo 'a9ebfa600ece03fb0005080c3b1184dfe52cea87  /root/.netbox-scanner.conf' | sh
 
 echo 'Netbox-scanner running..'
 
-exec python3 /netbox-scanner/netbox-scanner-438016caea3e975ce2cae34c443d661ee7b66b20/netbox-scanner/nbscanner
+exec python3 /netbox-scanner/netbox-scanner/nbscanner