Skip to content

Commit

Permalink
Fix: build-images and push-images with sed instead of bash expansion …
Browse files Browse the repository at this point in the history
…and parallel
  • Loading branch information
pando85 committed May 17, 2020
1 parent da85cb0 commit 992ec08
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ build-images: ## build images
build-images:
@for DOCKERFILE in $(DOCKERFILES);do \
docker build -f $$DOCKERFILE \
-t $(IMAGE_NAME):$(IMAGE_VERSION)`echo $${DOCKERFILE//.\/Dockerfile/} | tr '.' '-'` \
. ;\
done
-t $(IMAGE_NAME):$(IMAGE_VERSION)`echo $${DOCKERFILE} | sed 's/\.\/Dockerfile//' | tr '.' '-'` \
. &\
done; \
wait

push-images: ## push images
push-images:
@for DOCKERFILE in $(DOCKERFILES);do \
docker push $(IMAGE_NAME):$(IMAGE_VERSION)`echo $${DOCKERFILE//.\/Dockerfile/} | tr '.' '-'`;\
done
docker push $(IMAGE_NAME):$(IMAGE_VERSION)`echo $${DOCKERFILE} | sed 's/\.\/Dockerfile//' | tr '.' '-'` &\
done; \
wait

update-version: ## update version from VERSION file in all Cargo.toml manifests
update-version: */Cargo.toml
Expand Down

0 comments on commit 992ec08

Please sign in to comment.