Proposed fix for netbox-docker #765 -- SKIP_GIT will skip other git operations
This commit is contained in:
parent
6c9d4aebac
commit
51226c8e50
4
build.sh
4
build.sh
@ -178,7 +178,7 @@ fi
|
|||||||
###
|
###
|
||||||
BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M+00:00')"
|
BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M+00:00')"
|
||||||
|
|
||||||
if [ -d ".git" ]; then
|
if [ -d ".git" ] && [ -z "${SKIP_GIT}" ]; then
|
||||||
GIT_REF="$(git rev-parse HEAD)"
|
GIT_REF="$(git rev-parse HEAD)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -186,7 +186,7 @@ fi
|
|||||||
PROJECT_VERSION="${PROJECT_VERSION-$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' VERSION)}"
|
PROJECT_VERSION="${PROJECT_VERSION-$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' VERSION)}"
|
||||||
|
|
||||||
# Get the Git information from the netbox directory
|
# Get the Git information from the netbox directory
|
||||||
if [ -d "${NETBOX_PATH}/.git" ]; then
|
if [ -d "${NETBOX_PATH}/.git" ] && [ -z "${SKIP_GIT}" ]; then
|
||||||
NETBOX_GIT_REF=$(
|
NETBOX_GIT_REF=$(
|
||||||
cd "${NETBOX_PATH}"
|
cd "${NETBOX_PATH}"
|
||||||
git rev-parse HEAD
|
git rev-parse HEAD
|
||||||
|
Loading…
Reference in New Issue
Block a user