mirror of
https://github.com/openfaas/faas.git
synced 2025-06-09 08:46:48 +00:00
Add a consistent ARM64 image build process
Signed-off-by: Radoslav Dimitrov <rdimitrow@gmail.com>
This commit is contained in:
parent
33800a20d8
commit
41b452849c
10
Makefile
10
Makefile
@ -1,10 +1,12 @@
|
||||
.PHONY: build build-gateway test-ci
|
||||
.PHONY: build build-gateway test-ci ci-armhf-build ci-armhf-push ci-arm64-build ci-arm64-push
|
||||
TAG?=latest
|
||||
|
||||
build:
|
||||
./build.sh
|
||||
|
||||
build-gateway:
|
||||
(cd gateway; ./build.sh latest-dev)
|
||||
|
||||
test-ci:
|
||||
./contrib/ci.sh
|
||||
|
||||
@ -13,3 +15,9 @@ ci-armhf-build:
|
||||
|
||||
ci-armhf-push:
|
||||
(cd gateway; ./push.sh $(TAG))
|
||||
|
||||
ci-arm64-build:
|
||||
(cd gateway; ./build.sh $(TAG))
|
||||
|
||||
ci-arm64-push:
|
||||
(cd gateway; ./push.sh $(TAG))
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
declare -a repos=("openfaas-incubator/openfaas-operator" "openfaas-incubator/faas-idler" "openfaas/faas" "openfaas/faas-swarm" "openfaas/nats-queue-worker" "openfaas/faas-netes" "openfaas/faas-cli")
|
||||
HERE=`pwd`
|
||||
ARCH=$(uname -m)
|
||||
|
||||
#if [ ! -z "$CACHED" ]; then
|
||||
rm -rf staging || :
|
||||
@ -24,6 +25,14 @@ get_repo_name() {
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$ARCH" = "armv7l" ] ; then
|
||||
ARM_VERSION="armhf"
|
||||
elif [ "$ARCH" = "aarch64" ] ; then
|
||||
ARM_VERSION="arm64"
|
||||
fi
|
||||
|
||||
echo "Target architecture: ${ARM_VERSION}"
|
||||
|
||||
for i in "${repos[@]}"
|
||||
do
|
||||
cd $HERE
|
||||
@ -36,11 +45,11 @@ do
|
||||
echo "Latest release: $TAG"
|
||||
|
||||
REPOSITORY=$(get_repo_name $i)
|
||||
TAG_PRESENT=$(curl -s "https://hub.docker.com/v2/repositories/${REPOSITORY}/tags/${TAG}-armhf/" | grep -Po '"detail": *"[^"]*"' | grep -o 'Not found')
|
||||
TAG_PRESENT=$(curl -s "https://hub.docker.com/v2/repositories/${REPOSITORY}/tags/${TAG}-${ARM_VERSION}/" | grep -Po '"detail": *"[^"]*"' | grep -o 'Not found')
|
||||
|
||||
if [ "$TAG_PRESENT" = "Not found" ]; then
|
||||
make ci-armhf-build ci-armhf-push
|
||||
make ci-${ARM_VERSION}-build ci-${ARM_VERSION}-push
|
||||
else
|
||||
echo "Image is already present: ${REPOSITORY}:${TAG}-armhf"
|
||||
echo "Image is already present: ${REPOSITORY}:${TAG}-${ARM_VERSION}"
|
||||
fi
|
||||
done
|
||||
|
@ -9,6 +9,9 @@ export eTAG="latest-dev"
|
||||
if [ "$arch" = "armv7l" ] ; then
|
||||
dockerfile="Dockerfile.armhf"
|
||||
eTAG="latest-armhf-dev"
|
||||
elif [ "$arch" = "aarch64" ] ; then
|
||||
dockerfile="Dockerfile.arm64"
|
||||
eTAG="latest-arm64-dev"
|
||||
fi
|
||||
|
||||
echo "$1"
|
||||
@ -16,6 +19,8 @@ if [ "$1" ] ; then
|
||||
eTAG=$1
|
||||
if [ "$arch" = "armv7l" ] ; then
|
||||
eTAG="$1-armhf"
|
||||
elif [ "$arch" = "aarch64" ] ; then
|
||||
eTAG="$1-arm64"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -7,6 +7,8 @@ export eTAG="latest-dev"
|
||||
|
||||
if [ "$arch" = "armv7l" ] ; then
|
||||
eTAG="latest-armhf-dev"
|
||||
elif [ "$arch" = "aarch64" ] ; then
|
||||
eTAG="latest-arm64-dev"
|
||||
fi
|
||||
|
||||
echo "$1"
|
||||
@ -14,6 +16,8 @@ if [ "$1" ] ; then
|
||||
eTAG=$1
|
||||
if [ "$arch" = "armv7l" ] ; then
|
||||
eTAG="$1-armhf"
|
||||
elif [ "$arch" = "aarch64" ] ; then
|
||||
eTAG="$1-arm64"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user