fx rebase

Author: zhamborova

Makefile

@@ -13,22 +13,24 @@ BASE_IMAGE_OPENJ9=adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jre8u462-b08_openj9
 all: docker_build ## produce the docker image
 
 docker_build: ## build the docker image
-	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK) --no-cache -t $(BASE_IMAGE_NAME):$(VERSION) --target base .
-	docker build --build-arg base_image=$(BASE_IMAGE_OPENJ9) --no-cache -t $(BASE_IMAGE_NAME):$(OPENJ9_VERSION) --target base .
+	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK)   --no-cache -t $(BASE_IMAGE_NAME):$(VERSION) --target base .
+	docker build --build-arg base_image=$(BASE_IMAGE_OPENJ9)    --no-cache -t $(BASE_IMAGE_NAME):$(OPENJ9_VERSION) --target base .
 	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK11) --no-cache -t $(BASE_IMAGE_NAME):$(OPENJDK11_VERSION) --target base .
 	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK17) --no-cache -t $(BASE_IMAGE_NAME):$(OPENJDK17_VERSION) --target base .
 
-	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK) --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(VERSION) --target withtools .
-	docker build --build-arg base_image=$(BASE_IMAGE_OPENJ9) --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(OPENJ9_VERSION) --target withtools .
-	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK17) --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(OPENJDK17_VERSION) --target withtools .
+	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK)   --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(VERSION) --target withtools .
+	docker build --build-arg base_image=$(BASE_IMAGE_OPENJ9)    --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(OPENJ9_VERSION) --target withtools .
 	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK11) --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(OPENJDK11_VERSION) --target withtools .
+	docker build --build-arg base_image=$(BASE_IMAGE_OPENJDK17) --no-cache -t $(WITHTOOLS_IMAGE_NAME):$(OPENJDK17_VERSION) --target withtools .
 
 docker_scan: ## scan docker images using Docker Scout
 	docker scout quickview $(BASE_IMAGE_NAME):$(VERSION) || true
 	docker scout quickview $(BASE_IMAGE_NAME):$(OPENJ9_VERSION) || true
+	docker scout quickview $(BASE_IMAGE_NAME):$(OPENJDK11_VERSION) || true
 	docker scout quickview $(BASE_IMAGE_NAME):$(OPENJDK17_VERSION) || true
 	docker scout quickview $(WITHTOOLS_IMAGE_NAME):$(VERSION) || true
 	docker scout quickview $(WITHTOOLS_IMAGE_NAME):$(OPENJ9_VERSION) || true
+	docker scout quickview $(WITHTOOLS_IMAGE_NAME):$(OPENJDK11_VERSION) || true
 	docker scout quickview $(WITHTOOLS_IMAGE_NAME):$(OPENJDK17_VERSION) || true
 
 
@@ -41,8 +43,8 @@ push-docker-image: ## push the docker image to the registry (DOCKER_USER and DOC
 	docker push $(BASE_IMAGE_NAME):$(OPENJDK17_VERSION)
 	docker push $(WITHTOOLS_IMAGE_NAME):$(VERSION)
 	docker push $(WITHTOOLS_IMAGE_NAME):$(OPENJ9_VERSION)
-	docker push $(WITHTOOLS_IMAGE_NAME):$(OPENJDK17_VERSION)
 	docker push $(WITHTOOLS_IMAGE_NAME):$(OPENJDK11_VERSION)
+	docker push $(WITHTOOLS_IMAGE_NAME):$(OPENJDK17_VERSION)
 
 .PHONY: push-latest-docker-image
 push-latest-docker-image: ## push the docker image with the "latest" tag to the registry (DOCKER_USER and DOCKER_PASS mandatory)