From bc2a5e861a643c967441db3d10c4e101cfc310ff Mon Sep 17 00:00:00 2001 From: Michael Pilosov Date: Sun, 26 Dec 2021 13:38:24 -0700 Subject: [PATCH] for arm64 --- Makefile | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index ba2b160..88d6510 100644 --- a/Makefile +++ b/Makefile @@ -1,41 +1,47 @@ build: 2019.1.0 -2019.1.0: - docker build -t fenics -t fenics-2019.1.0 -f Dockerfile-2019.1.0 . - -2019.1.0.post0: - docker build -t fenics -t fenics-2019.1.0.post0 -f Dockerfile-2019.1.0.post0 . - SHELL=bash -# docker buildx build --platform linux/amd64,linux/amd64 +# docker buildx build --platform linux/arm64,linux/arm64 # {3.6.{14..15},3.{7..8}.{11..12},3.9.{6..9},3.10.{0..1}}-{bullseye,buster} 3.{7..8}.{4..10}-buster 3.6.{9..13}-buster 2019.1.0: for TAG in $(shell echo 3.6.{9..13}-buster 3.{7..8}.{4..10}-buster {3.6.{14..15},3.{7..8}.{11..12},3.9.{6..9},3.10.{0..1}}-buster | sort); do \ VER=2019.1.0;\ - echo BUILDING mindthemath/fenics-amd64:$$VER-$$TAG; \ + echo BUILDING mindthemath/fenics-arm64:$$VER-$$TAG; \ docker build \ - -t mindthemath/fenics-amd64:$$VER-$$TAG \ + -t mindthemath/fenics-arm64:$$VER-$$TAG \ --build-arg PYTHON_TAG=$$TAG \ --build-arg FENICS_VERSION=$$VER \ -f Dockerfile-2019.1.0 . && \ - docker push mindthemath/fenics-amd64:$$VER-$$TAG || exit; \ + docker push mindthemath/fenics-arm64:$$VER-$$TAG && \ + docker rmi mindthemath/fenics-arm64:$$VER-$$TAG || exit; \ done - #docker rmi mindthemath/fenics-amd64:$$VER-$$TAG || exit; 2019.1.0.post0: for TAG in $(shell echo 3.6.{9..13}-buster 3.{7..8}.{4..10}-buster {3.6.{14..15},3.{7..8}.{11..12},3.9.{6..9},3.10.{0..1}}-{buster,bullseye} | sort); do \ VER=2019.1.0.post0;\ - echo BUILDING mindthemath/fenics-amd64:$$VER-$$TAG; \ + echo BUILDING mindthemath/fenics-arm64:$$VER-$$TAG; \ docker build \ - -t mindthemath/fenics-amd64:$$VER-$$TAG \ + -t mindthemath/fenics-arm64:$$VER-$$TAG \ --build-arg PYTHON_TAG=$$TAG \ --build-arg FENICS_VERSION=$$VER \ -f Dockerfile-2019.1.0 . && \ - docker push mindthemath/fenics-amd64:$$VER-$$TAG || exit; \ + docker push mindthemath/fenics-arm64:$$VER-$$TAG && \ + docker rmi mindthemath/fenics-arm64:$$VER-$$TAG || exit; \ done - #docker rmi mindthemath/fenics-amd64:$$VER-$$TAG || exit; -all: 2019.1.0 2019.1.0.post0 +2019.2.0.dev0: + for TAG in $(shell echo 3.6.{9..13}-buster 3.{7..8}.{4..10}-buster {3.6.{14..15},3.{7..8}.{11..12},3.9.{6..9},3.10.{0..1}}-{buster,bullseye} | sort); do \ + VER=2019.2.0.dev0;\ + echo BUILDING mindthemath/fenics-arm64:$$VER-$$TAG; \ + docker build \ + -t mindthemath/fenics-arm64:$$VER-$$TAG \ + --build-arg PYTHON_TAG=$$TAG \ + -f Dockerfile . && \ + docker push mindthemath/fenics-arm64:$$VER-$$TAG && \ + docker rmi mindthemath/fenics-arm64:$$VER-$$TAG || exit; \ + done + +all: 2019.1.0 2019.1.0.post0 2019.2.0.dev0 buster: docker build \