more dockerignore

Author: chrisplo

.dockerignore

@@ -1,11 +1,15 @@
 # we want to get the git commit SHA but not all the binary repo data
 .git/objects/pack
 bin/
+**/*.pyc
 .vagrant
 vagrant/
 docs/
 scripts/gobgp
+# this is the dockerfile for binary compilation, other dockerfiles
+# may want archive artifacts, but this one does not
 *.tar
+**/*.tar.gz
 *.bz2
 # export from a docker container, no need to copy into any docker containers
 install/v2plugin/rootfs

scripts/getGitVersion.sh

@@ -7,11 +7,7 @@ NIGHTLY_RELEASE=${NIGHTLY_RELEASE:-}
 
 # calculate version
 if command -v git &>/dev/null && git rev-parse &>/dev/null; then
-	GIT_COMMIT=$(git describe --tags --always 2>/dev/null || echo unknown)
-	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		GIT_COMMIT="$GIT_COMMIT-unsupported"
-	fi
-	VERSION=$GIT_COMMIT
+	VERSION=$(git describe --abbrev=7 --dirty=-unsupported --tags --always 2>/dev/null || echo unknown)
 else
 	echo >&2 'error: unable to determine the git revision'
 	exit 1

scripts/v2plugin_rootfs.sh

@@ -32,7 +32,7 @@ rm install/v2plugin/${TAR_FILE}
 id=$(docker create $DOCKER_IMAGE true)
 
 # create the rootfs archive based on the created container contents
-sudo docker export "${id}" > install/v2plugin/${V2PLUGIN_TAR_FILENAME}
+docker export "${id}" > install/v2plugin/${V2PLUGIN_TAR_FILENAME}
 
 # clean up created container
 docker rm -vf "${id}"