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

Merge pull request #963 from netbox-community/develop

Browse Source 
Version 2.5.1
This commit is contained in:
Tobias Genannt 2023-03-16 11:13:13 +01:00 committed by GitHub
commit 97ee353b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.5.0 2.5.1

5
build-functions/get-public-image-config.sh
View File

@ -6,11 +6,6 @@ get_image_label() {
skopeo inspect "docker://$image" | jq -r ".Labels[\"$label\"]" skopeo inspect "docker://$image" | jq -r ".Labels[\"$label\"]"
} }
get_image_layers() {
local image=$1
skopeo inspect "docker://$image" | jq -r ".Layers"
}
get_image_last_layer() { get_image_last_layer() {
local image=$1 local image=$1
skopeo inspect "docker://$image" | jq -r ".Layers | last" skopeo inspect "docker://$image" | jq -r ".Layers | last"

5
build.sh
View File

@ -324,11 +324,11 @@ else
source ./build-functions/get-public-image-config.sh source ./build-functions/get-public-image-config.sh
echo "Checking labels for '${FINAL_DOCKER_TAG}'" echo "Checking labels for '${FINAL_DOCKER_TAG}'"
BASE_LAST_LAYER=$(get_image_last_layer "${DOCKER_FROM}") BASE_LAST_LAYER=$(get_image_last_layer "${DOCKER_FROM}")
mapfile -t IMAGES_LAYERS_OLD < <(get_image_layers "${FINAL_DOCKER_TAG}") OLD_BASE_LAST_LAYER=$(get_image_label netbox.last-base-image-layer "${FINAL_DOCKER_TAG}")
NETBOX_GIT_REF_OLD=$(get_image_label netbox.git-ref "${FINAL_DOCKER_TAG}") NETBOX_GIT_REF_OLD=$(get_image_label netbox.git-ref "${FINAL_DOCKER_TAG}")
GIT_REF_OLD=$(get_image_label org.opencontainers.image.revision "${FINAL_DOCKER_TAG}") GIT_REF_OLD=$(get_image_label org.opencontainers.image.revision "${FINAL_DOCKER_TAG}")
if ! printf '%s\n' "${IMAGES_LAYERS_OLD[@]}" | grep -q -P "^${BASE_LAST_LAYER}\$"; then if [ "${BASE_LAST_LAYER}" != "${OLD_BASE_LAST_LAYER}" ]; then
SHOULD_BUILD="true" SHOULD_BUILD="true"
BUILD_REASON="${BUILD_REASON} ubuntu" BUILD_REASON="${BUILD_REASON} ubuntu"
fi fi
@ -388,6 +388,7 @@ fi
if [ -n "${BUILD_REASON}" ]; then if [ -n "${BUILD_REASON}" ]; then
BUILD_REASON=$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' <<<"$BUILD_REASON") BUILD_REASON=$(sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' <<<"$BUILD_REASON")
DOCKER_BUILD_ARGS+=(--label "netbox.build-reason=${BUILD_REASON}") DOCKER_BUILD_ARGS+=(--label "netbox.build-reason=${BUILD_REASON}")
DOCKER_BUILD_ARGS+=(--label "netbox.last-base-image-layer=${BASE_LAST_LAYER}")
fi fi
# --build-arg # --build-arg

2
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
netbox: &netbox netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v3.4-2.5.0} image: docker.io/netboxcommunity/netbox:${VERSION-v3.4-2.5.1}
depends_on: depends_on:
- postgres - postgres
- redis - redis

7
docker/docker-entrypoint.sh
View File

@ -84,9 +84,12 @@ fi
./manage.py shell --interface python <<END ./manage.py shell --interface python <<END
from users.models import Token from users.models import Token
old_default_token = Token.objects.get(key="0123456789abcdef0123456789abcdef01234567") try:
if old_default_token: old_default_token = Token.objects.get(key="0123456789abcdef0123456789abcdef01234567")
if old_default_token:
print("⚠️ Warning: You have the old default admin token in your database. This token is widely known; please remove it.") print("⚠️ Warning: You have the old default admin token in your database. This token is widely known; please remove it.")
except Token.DoesNotExist:
pass
END END
echo "✅ Initialisation is done." echo "✅ Initialisation is done."