Skip to content

Commit e3fe162

Browse files
committed
New baseimage and added arm64v8 support
1 parent 96fcf97 commit e3fe162

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ default: list
22

33
DOCKER_IMAGE ?= edofede/nginx-php-fpm
44

5-
ARCHS ?= amd64 arm32v6 arm32v7 i386 ppc64le
6-
BASEIMAGE_BRANCH ?= 2.3
5+
ARCHS ?= amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le
6+
BASEIMAGE_BRANCH ?= 2.4
77

88
GITHUB_TOKEN ?= "NONE"
99

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ else
8080
fi
8181

8282
if [ -z QEMU_RELEASE ]; then
83-
QEMU_RELEASE="v3.0.0"
83+
QEMU_RELEASE="v4.2.0-2"
8484
fi
8585

8686
for i in ${!ARCHS[@]}; do

scripts/multiArchMatrix.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
ARCHS=( amd64 arm32v6 arm32v7 i386 ppc64le)
4-
DOCKER_ARCHS=( amd64 arm arm 386 ppc64le)
5-
ARCH_VARIANTS=( NONE v6 v7 NONE NONE)
6-
QEMU_ARCHS=( NONE arm arm i386 ppc64le)
7-
TEST_ENABLED=( 1 0 0 1 0)
3+
ARCHS=( amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le)
4+
DOCKER_ARCHS=( amd64 arm arm arm 386 ppc64le)
5+
ARCH_VARIANTS=( NONE v6 v7 v8 NONE NONE)
6+
QEMU_ARCHS=( NONE arm arm aarch64 i386 ppc64le)
7+
TEST_ENABLED=( 1 1 1 1 1 0)

0 commit comments

Comments
 (0)