Move dockerfile into a single folder (fluid-cloudnative#876)

* move dockerfile Signed-off-by: littletiger123 <[email protected]> * move dockerfile Signed-off-by: littletiger123 <[email protected]>
zhang-x-z · Jun 16, 2021 · cbc497a · cbc497a
1 parent dbeda0c
commit cbc497a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -114,16 +114,16 @@ update-api-doc:
 
 # Build the docker image
 docker-build-dataset-controller: generate fmt vet
-	docker build --no-cache . -f Dockerfile.dataset -t ${DATASET_CONTROLLER_IMG}:${GIT_VERSION}
+	docker build --no-cache . -f docker/Dockerfile.dataset -t ${DATASET_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-alluxioruntime-controller: generate fmt vet
-	docker build --no-cache . -f Dockerfile.alluxioruntime -t ${ALLUXIORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
+	docker build --no-cache . -f docker/Dockerfile.alluxioruntime -t ${ALLUXIORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-jindoruntime-controller: generate fmt vet
-	docker build --no-cache . -f Dockerfile.jindoruntime -t ${JINDORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
+	docker build --no-cache . -f docker/Dockerfile.jindoruntime -t ${JINDORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-csi: generate fmt vet
-	docker build --no-cache . -f Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}
+	docker build --no-cache . -f docker/Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}
 
 docker-build-loader:
 	docker build --no-cache charts/fluid-dataloader/docker/loader -t ${LOADER_IMG}
@@ -132,7 +132,7 @@ docker-build-init-users:
 	docker build --no-cache charts/alluxio/docker/init-users -t ${INIT_USERS_IMG}:${GIT_VERSION}
 
 docker-build-webhook:
-	docker build --no-cache . -f Dockerfile.webhook -t ${WEBHOOK_IMG}:${GIT_VERSION}
+	docker build --no-cache . -f docker/Dockerfile.webhook -t ${WEBHOOK_IMG}:${GIT_VERSION}
 
 # Push the docker image
 docker-push-dataset-controller: docker-build-dataset-controller

diff --git a/Dockerfile.alluxioruntime → docker/Dockerfile.alluxioruntime b/Dockerfile.alluxioruntime → docker/Dockerfile.alluxioruntime
diff --git a/Dockerfile.csi → docker/Dockerfile.csi b/Dockerfile.csi → docker/Dockerfile.csi
diff --git a/Dockerfile.dataset → docker/Dockerfile.dataset b/Dockerfile.dataset → docker/Dockerfile.dataset
diff --git a/Dockerfile.jindoruntime → docker/Dockerfile.jindoruntime b/Dockerfile.jindoruntime → docker/Dockerfile.jindoruntime
diff --git a/Dockerfile.webhook → docker/Dockerfile.webhook b/Dockerfile.webhook → docker/Dockerfile.webhook
diff --git a/pkg/ddc/alluxio/shutdown_test.go b/pkg/ddc/alluxio/shutdown_test.go
@@ -1,7 +1,6 @@
 package alluxio
 
 import (
-	"fmt"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
 	"github.com/fluid-cloudnative/fluid/pkg/utils/kubeclient"
@@ -24,6 +23,7 @@ func init() {
 }
 
 func TestDestroyWorker(t *testing.T) {
+	// runtimeInfoSpark tests destroy Worker in exclusive mode.
 	runtimeInfoSpark, err := base.BuildRuntimeInfo("spark", "fluid", "alluxio", datav1alpha1.Tieredstore{})
 	if err != nil {
 		t.Errorf("fail to create the runtimeInfo with error %v", err)
@@ -32,12 +32,13 @@ func TestDestroyWorker(t *testing.T) {
 		Spec: datav1alpha1.DatasetSpec{PlacementMode: datav1alpha1.ExclusiveMode},
 	})
 
+	// runtimeInfoSpark tests destroy Worker in shareMode mode.
 	runtimeInfoHadoop, err := base.BuildRuntimeInfo("hadoop", "fluid", "alluxio", datav1alpha1.Tieredstore{})
 	if err != nil {
 		t.Errorf("fail to create the runtimeInfo with error %v", err)
 	}
 	runtimeInfoHadoop.SetupWithDataset(&datav1alpha1.Dataset{
-		Spec: datav1alpha1.DatasetSpec{PlacementMode: datav1alpha1.ExclusiveMode},
+		Spec: datav1alpha1.DatasetSpec{PlacementMode: datav1alpha1.ShareMode},
 	})
 	nodeSelector := map[string]string{
 		"node-select": "true",
@@ -46,7 +47,7 @@ func TestDestroyWorker(t *testing.T) {
 
 	var nodeInputs = []*v1.Node{
 		{
-			ObjectMeta: metav1.ObjectMeta{ // 里面只有fluid的spark
+			ObjectMeta: metav1.ObjectMeta{
 				Name: "test-node-spark",
 				Labels: map[string]string{
 					"fluid.io/dataset-num":               "1",
@@ -164,7 +165,6 @@ func TestDestroyWorker(t *testing.T) {
 		if err != nil {
 			t.Errorf("fail to exec the function with the error %v", err)
 		}
-		fmt.Println(engine.Client)
 		currentWorkers, err := engine.destroyWorkers(test.expectedWorkers)
 		if err != nil {
 			t.Errorf("fail to exec the function with the error %v", err)