OpenWRT
/
docker
mirror of https://github.com/openwrt/docker.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup tag logic 

* SDKs get their target tags in a later step.
* If arch is x86_64 it becomes the branch default

Signed-off-by: Paul Spooren <mail@aparcar.org>
pull/79/head
Paul Spooren 2021-02-24 18:56:47 -10:00
parent d2efc132bf
commit 4549d070bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-build.sh
View File

@ -9,7 +9,9 @@ TMP_IMAGE_NAME=$(tr -dc '[:lower:]' </dev/urandom | fold -w 32 | head -n 1)
docker build -t "$TMP_IMAGE_NAME" -f "./build/Dockerfile" ./build
for IMAGE in $DOCKER_IMAGE; do
docker tag "$TMP_IMAGE_NAME" "$IMAGE:$TARGET-$VERSION"
if [ -n "$TARGET" ]; then
docker tag "$TMP_IMAGE_NAME" "$IMAGE:$TARGET-$VERSION"
fi
if [ -n "$ARCH" ]; then
docker tag "$TMP_IMAGE_NAME" "$IMAGE:$ARCH-$VERSION"
@ -20,7 +22,7 @@ for IMAGE in $DOCKER_IMAGE; do
fi
fi
if [ "$TARGET" == "x86-64" ]; then
if [ "$TARGET" == "x86-64" ] || [ "$ARCH" == "x86_64" ]; then
docker tag "$TMP_IMAGE_NAME" "$IMAGE:$VERSION"
docker tag "$TMP_IMAGE_NAME" "$IMAGE:$BRANCH"