diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2019-06-21 21:01:43 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2019-06-21 21:01:43 -0700 |
| commit | 12e2e0292534b48840bcb110897256c12d8117f3 (patch) | |
| tree | f94b18571e2940518e9fd985d168a3bf7da5f717 | |
| parent | 19208bfab2fd5328d5e4703177a40e2d950c1486 (diff) | |
Tweak Docker manifest
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | Makefile | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.dockerignore b/.dockerignore index e17c9e33..78631770 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,6 +17,7 @@ tests ChangeLog composer.json Dockerfile +Dockerfile.* Makefile package.json Vagrantfile @@ -82,10 +82,10 @@ docker-image: docker-manifest: for version in $(VERSION) latest; do \ - docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):amd64-$${version} -f Dockerfile . && \ - docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm32v6-$${version} -f Dockerfile.arm32v6 . && \ - docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm32v7-$${version} -f Dockerfile.arm32v7 . && \ - docker build --build-arg VERSION=$${version} -t $(DOCKER_IMAGE):arm64v8-$${version} -f Dockerfile.arm64v8 . && \ + docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):amd64-$${version} -f Dockerfile . && \ + docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm32v6-$${version} -f Dockerfile.arm32v6 . && \ + docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm32v7-$${version} -f Dockerfile.arm32v7 . && \ + docker build --build-arg VERSION=$(VERSION) -t $(DOCKER_IMAGE):arm64v8-$${version} -f Dockerfile.arm64v8 . && \ docker push $(DOCKER_IMAGE):amd64-$${version} && \ docker push $(DOCKER_IMAGE):arm32v6-$${version} && \ docker push $(DOCKER_IMAGE):arm32v7-$${version} && \ |