Commit 44e70a29 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] Minor docker images Makefile cleanups

parent 8e0779a9
...@@ -97,6 +97,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND) ...@@ -97,6 +97,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
release_core_testing_php73 \ release_core_testing_php73 \
release_core_testing_php74 \ release_core_testing_php74 \
release_core_testing_php80 \ release_core_testing_php80 \
release_core_testing_php81 \
release_core_testing_js \ release_core_testing_js \
release_core_testing_js_chrome \ release_core_testing_js_chrome \
release_core_testing_js_node8 \ release_core_testing_js_node8 \
...@@ -108,6 +109,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND) ...@@ -108,6 +109,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
clean_images_core_testing_php73 \ clean_images_core_testing_php73 \
clean_images_core_testing_php74 \ clean_images_core_testing_php74 \
clean_images_core_testing_php80 \ clean_images_core_testing_php80 \
clean_images_core_testing_php81 \
clean_images_core_testing_js \ clean_images_core_testing_js \
clean_images_core_testing_js_chrome \ clean_images_core_testing_js_chrome \
clean_images_core_testing_js_node8 \ clean_images_core_testing_js_node8 \
...@@ -234,6 +236,8 @@ clean_images_core_testing_php80: ...@@ -234,6 +236,8 @@ clean_images_core_testing_php80:
docker rmi $(NAME_PHP80):$(SHORTVERSION_PHP80) || true docker rmi $(NAME_PHP80):$(SHORTVERSION_PHP80) || true
docker rmi $(NAME_PHP80):$(FULLVERSION_PHP80) || true docker rmi $(NAME_PHP80):$(FULLVERSION_PHP80) || true
build_core_testing_php81: build_core_testing_php81:
docker build --force-rm --rm -t $(NAME_PHP81):$(FULLVERSION_PHP81) core-testing-php81 docker build --force-rm --rm -t $(NAME_PHP81):$(FULLVERSION_PHP81) core-testing-php81
docker tag $(NAME_PHP81):$(FULLVERSION_PHP81) $(NAME_PHP81):$(SHORTVERSION_PHP81) docker tag $(NAME_PHP81):$(FULLVERSION_PHP81) $(NAME_PHP81):$(SHORTVERSION_PHP81)
...@@ -253,6 +257,7 @@ clean_images_core_testing_php81: ...@@ -253,6 +257,7 @@ clean_images_core_testing_php81:
docker rmi $(NAME_PHP81):$(FULLVERSION_PHP81) || true docker rmi $(NAME_PHP81):$(FULLVERSION_PHP81) || true
build_core_testing_js: build_core_testing_js:
docker build -t $(NAME_JS):$(FULLVERSION_JS) core-testing-js docker build -t $(NAME_JS):$(FULLVERSION_JS) core-testing-js
docker tag $(NAME_JS):$(FULLVERSION_JS) $(NAME_JS):$(SHORTVERSION_JS) docker tag $(NAME_JS):$(FULLVERSION_JS) $(NAME_JS):$(SHORTVERSION_JS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment