Skip to content

Commit 84d96d1

Browse files
committed
Updated to new baseimage
1 parent fae1e51 commit 84d96d1

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DOCKER_IMAGE ?= $(DOCKER_HUB_REPO)/$(IMAGE_NAME)
88
DOCKER_TEST_IMAGE = $(DOCKER_LOCAL_REPO)/$(IMAGE_NAME)
99

1010
PLATFORM ?= amd64
11-
BASEIMAGE_BRANCH ?= 2.7
11+
BASEIMAGE_BRANCH ?= 2.8
1212

1313
GITHUB_TOKEN ?= "NONE"
1414

scripts/run.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ getQemu() {
1717

1818
cleanup
1919

20-
if [ -z GITHUB_TOKEN ] || [ "$GITHUB_TOKEN" == "NONE" ]; then
20+
if [ -z "$GITHUB_TOKEN" ] || [ "$GITHUB_TOKEN" == "NONE" ]; then
2121
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/')
2222
else
2323
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/')
2424
fi
2525

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"
2828
fi
2929

3030
for i in ${!PLATFORMS[@]}; do
@@ -36,14 +36,16 @@ getQemu() {
3636

3737
if [ "$QEMU_ARCH" != "NONE" ]; then
3838
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"
3941

4042
curl -sS -L \
4143
--connect-timeout 5 \
4244
--max-time 10 \
4345
--retry 5 \
4446
--retry-delay 0 \
4547
--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 \
4749
-o build_tmp/qemu-$QEMU_ARCH-static.tar.gz && \
4850
tar zxvf \
4951
build_tmp/qemu-*-static.tar.gz \

0 commit comments

Comments
 (0)