matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #118 from cimnine/consistent_variables

Browse Source 
Consistent variable use in build scripts
This commit is contained in:
Christian Mäder 2019-02-06 12:35:18 +01:00 committed by GitHub
commit fc1507a55d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-branches.sh
View File

@ -11,7 +11,7 @@ else
GITHUB_OAUTH_PARAMS="" GITHUB_OAUTH_PARAMS=""
fi fi
ORIGINAL_GITHUB_REPO="digitalocean/netbox" ORIGINAL_GITHUB_REPO="${SRC_ORG-digitalocean}/${SRC_REPO-netbox}"
GITHUB_REPO="${GITHUB_REPO-$ORIGINAL_GITHUB_REPO}" GITHUB_REPO="${GITHUB_REPO-$ORIGINAL_GITHUB_REPO}"
URL_RELEASES="https://api.github.com/repos/${GITHUB_REPO}/branches?${GITHUB_OAUTH_PARAMS}" URL_RELEASES="https://api.github.com/repos/${GITHUB_REPO}/branches?${GITHUB_OAUTH_PARAMS}"

8
build-latest.sh
View File

@ -47,7 +47,7 @@ if [ "${PRERELEASE}" == "true" ]; then
fi fi
# Check if that version is not already available on docker hub: # Check if that version is not already available on docker hub:
ORIGINAL_DOCKERHUB_REPO="netboxcommunity/netbox" ORIGINAL_DOCKERHUB_REPO="${DOCKER_ORG-netboxcommunity}/${DOCKER_REPO-netbox}"
DOCKERHUB_REPO="${DOCKERHUB_REPO-$ORIGINAL_DOCKERHUB_REPO}" DOCKERHUB_REPO="${DOCKERHUB_REPO-$ORIGINAL_DOCKERHUB_REPO}"
URL_DOCKERHUB_TOKEN="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${DOCKERHUB_REPO}:pull" URL_DOCKERHUB_TOKEN="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${DOCKERHUB_REPO}:pull"
BEARER_TOKEN="$($CURL "${URL_DOCKERHUB_TOKEN}" | jq -r .token)" BEARER_TOKEN="$($CURL "${URL_DOCKERHUB_TOKEN}" | jq -r .token)"
@ -63,7 +63,11 @@ fi
ALREADY_BUILT="$($CURL -H "${AUTHORIZATION_HEADER}" "${URL_DOCKERHUB_TAG}" | jq -e ".tags | any(.==\"${DOCKER_TAG}\")")" ALREADY_BUILT="$($CURL -H "${AUTHORIZATION_HEADER}" "${URL_DOCKERHUB_TAG}" | jq -e ".tags | any(.==\"${DOCKER_TAG}\")")"
if [ "$ALREADY_BUILT" == "false" ]; then if [ -n "$DEBUG" ] && [ "$ALREADY_BUILT" == "false" ]; then
if [ -n "$DEBUG" ]; then
echo "⚠️ Would not build, because ${DOCKER_TAG} already exists on https://hub.docker.com/r/${DOCKERHUB_REPO}, but DEBUG is enabled."
fi
# shellcheck disable=SC2068 # shellcheck disable=SC2068
./build.sh "${VERSION}" $@ ./build.sh "${VERSION}" $@
exit $? exit $?

23
docker/docker-entrypoint.sh
View File

@ -1,6 +1,27 @@
#!/bin/bash #!/bin/bash
set -e set -e
# inform about deprecation
depraction_warning() {
echo ""
echo ""
echo ""
echo "⚠️ WARNING ⚠️ WARNING ⚠️ WARNING ⚠️"
echo ""
echo "📣️ The docker images for Netbox have moved to 'netboxcommunity/netbox'."
echo ""
echo "❌ Your setup will not get any updates anymore."
echo "❌ Your setup will break after 2019."
echo ""
echo "ℹ️ Just rename 'ninech/netbox' to 'netboxcommunity/netbox' and your good again."
echo ""
echo ""
echo ""
}
depraction_warning
# wait shortly and then run db migrations (retry on error) # wait shortly and then run db migrations (retry on error)
while ! ./manage.py migrate 2>&1; do while ! ./manage.py migrate 2>&1; do
echo "⏳ Waiting on DB..." echo "⏳ Waiting on DB..."
@ -49,6 +70,8 @@ done
echo "✅ Initialisation is done." echo "✅ Initialisation is done."
depraction_warning
# launch whatever is passed by docker # launch whatever is passed by docker
# (i.e. the RUN instruction in the Dockerfile) # (i.e. the RUN instruction in the Dockerfile)
exec ${@} exec ${@}