File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ DOCKER_IMAGE ?= $(DOCKER_HUB_REPO)/$(IMAGE_NAME)
8
8
DOCKER_TEST_IMAGE = $(DOCKER_LOCAL_REPO ) /$(IMAGE_NAME )
9
9
10
10
PLATFORM ?= amd64
11
- BASEIMAGE_BRANCH ?= 2.7
11
+ BASEIMAGE_BRANCH ?= 2.8
12
12
13
13
GITHUB_TOKEN ?= "NONE"
14
14
Original file line number Diff line number Diff line change @@ -17,14 +17,14 @@ getQemu() {
17
17
18
18
cleanup
19
19
20
- if [ -z GITHUB_TOKEN ] || [ " $GITHUB_TOKEN " == " NONE" ]; then
20
+ if [ -z " $ GITHUB_TOKEN" ] || [ " $GITHUB_TOKEN " == " NONE" ]; then
21
21
QEMU_RELEASE=$( curl -sS --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 1 --retry-max-time 60 " https://api.github.com/repos/multiarch/qemu-user-static/releases/latest" | grep ' "tag_name":' | sed -E ' s/.*"([^"]+)".*/\1/' )
22
22
else
23
23
QEMU_RELEASE=$( curl -u EdoFede:$GITHUB_TOKEN -sS --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 1 --retry-max-time 60 " https://api.github.com/repos/multiarch/qemu-user-static/releases/latest" | grep ' "tag_name":' | sed -E ' s/.*"([^"]+)".*/\1/' )
24
24
fi
25
25
26
- if [ -z QEMU_RELEASE ]; then
27
- QEMU_RELEASE=" v4.2 .0-2 "
26
+ if [ -z " $ QEMU_RELEASE" ]; then
27
+ QEMU_RELEASE=" v6.1 .0-6 "
28
28
fi
29
29
30
30
for i in ${! PLATFORMS[@]} ; do
@@ -36,14 +36,16 @@ getQemu() {
36
36
37
37
if [ " $QEMU_ARCH " != " NONE" ]; then
38
38
mkdir -p build_tmp/qemu
39
+ QEMU_LINK=" https://github.com/multiarch/qemu-user-static/releases/download/$QEMU_RELEASE /qemu-$QEMU_ARCH -static.tar.gz"
40
+ logDetail " Downloading qemu static from: $QEMU_LINK "
39
41
40
42
curl -sS -L \
41
43
--connect-timeout 5 \
42
44
--max-time 10 \
43
45
--retry 5 \
44
46
--retry-delay 0 \
45
47
--retry-max-time 60 \
46
- https://github.com/multiarch/qemu-user-static/releases/download/ $QEMU_RELEASE /qemu- $QEMU_ARCH -static.tar.gz \
48
+ $QEMU_LINK \
47
49
-o build_tmp/qemu-$QEMU_ARCH -static.tar.gz && \
48
50
tar zxvf \
49
51
build_tmp/qemu-* -static.tar.gz \
You can’t perform that action at this time.
0 commit comments