Fix githash in Docker image tag agin.

This commit is contained in:
Albrecht Lohofener
2024-11-09 23:05:05 +01:00
parent 724842c2fa
commit b3714c1409
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -330,6 +330,6 @@ jobs:
GIT_HASH=`git rev-parse --short HEAD`
docker buildx imagetools create \
--tag albrechtloh/openwrt-docker:openwrt-${{ env.OPENWRT_VERSION }}-${{ env.GIT_HASH }} \
--tag albrechtloh/openwrt-docker:openwrt-${{ env.OPENWRT_VERSION }}-$GIT_HASH \
--tag albrechtloh/openwrt-docker:latest \
albrechtloh/openwrt-docker:ci-openwrt-stable
+1 -1
View File
@@ -94,7 +94,7 @@ def run_openwrt_shell_command(command, *arg):
pid = ret['return']['pid']
# Get stdout of process
time.sleep(5) # Give command 5 seconds time to respond. It would be better to implement a real timeout here but I need to got he bed :-(
time.sleep(5) # Give command 5 seconds time to respond. It would be better to implement a real timeout.
# Call qemu guest tools function 'guest-exec-status'. This is only working if OpenWrt is booted and the qemu guest tools are running
process = subprocess.run(['docker','exec','openwrt','sh','-c',r"""echo -ne '{"execute":"guest-exec-status", "arguments": { "pid": """ + str(pid) + r"""}}' | nc -w 1 -U /run/qga.sock"""],
stdout=subprocess.PIPE,