Skip to content

Commit

Permalink
remove empty scheduler docker image (#1002)
Browse files Browse the repository at this point in the history
* remove empty scheduler docker image

Signed-off-by: yimingwangdell <[email protected]>

* fixup

Signed-off-by: yimingwangdell <[email protected]>

* fixup

Signed-off-by: yimingwangdell <[email protected]>

---------

Signed-off-by: yimingwangdell <[email protected]>
  • Loading branch information
yimingwangdell authored May 15, 2023
1 parent 29bc09d commit d2efc7b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions Makefile.docker
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ image-node \
image-controller \
image-extender \
image-extender-patcher \
image-scheduler \
image-node-controller
# image-scheduler \

base-images: base-image-drivemgr base-image-node base-image-controller

Expand Down Expand Up @@ -57,9 +57,9 @@ image-extender:
image-extender-patcher:
docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG} ./pkg/${SCHEDULER_EXTENDER_PATCHER_PKG}

image-scheduler:
cp ./pkg/${SCHEDULER}/${PLUGIN}/Dockerfile ./build/${SCHEDULING_PKG}/${SCHEDULER}/
docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ./build/${SCHEDULING_PKG}/${SCHEDULER}
# image-scheduler:
# cp ./pkg/${SCHEDULER}/${PLUGIN}/Dockerfile ./build/${SCHEDULING_PKG}/${SCHEDULER}/
# docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ./build/${SCHEDULING_PKG}/${SCHEDULER}

image-node-controller:
cp ./pkg/${CR_CONTROLLERS}/${NODE_CONTROLLER_PKG}/Dockerfile ./build/${CR_CONTROLLERS}/${NODE_CONTROLLER}/
Expand All @@ -74,8 +74,8 @@ push-node \
push-controller \
push-extender \
push-extender-patcher \
push-scheduler \
push-node-controller
# push-scheduler \

push-drivemgr:
docker push ${REGISTRY}/${PROJECT}-${DRIVE_MANAGER_TYPE}:${TAG}
Expand All @@ -93,8 +93,8 @@ push-extender:
push-extender-patcher:
docker push ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG}

push-scheduler:
docker push ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
# push-scheduler:
# docker push ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}

push-node-controller:
docker push ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}
Expand All @@ -107,8 +107,8 @@ clean-image-controller \
clean-image-drivemgr \
clean-image-extender \
clean-image-extender-patcher \
clean-image-scheduler \
clean-image-node-controller
# clean-image-scheduler \

clean-image-drivemgr:
docker rmi ${REGISTRY}/${PROJECT}-${DRIVE_MANAGER_TYPE}:${TAG}
Expand All @@ -126,8 +126,8 @@ clean-image-extender:
clean-image-extender-patcher:
docker rmi ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG}

clean-image-scheduler:
docker rmi ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
# clean-image-scheduler:
# docker rmi ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}

clean-image-node-controller:
docker rmi ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}
6 changes: 3 additions & 3 deletions Makefile.validation
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ kind-pull-images: kind-pull-sidecar-images
docker pull ${REGISTRY}/${PROJECT}-${CONTROLLER}:${TAG}
docker pull ${REGISTRY}/${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
docker pull ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG}
docker pull ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
# docker pull ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
docker pull ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}

kind-pull-sidecar-images:
Expand Down Expand Up @@ -113,7 +113,7 @@ kind-tag-images:
docker tag ${REGISTRY}/${PROJECT}-${CONTROLLER}:${TAG} ${PROJECT}-${CONTROLLER}:${TAG}
docker tag ${REGISTRY}/${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG} ${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
docker tag ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG} ${PROJECT}-${EXTENDER_PATCHER}:${TAG}
docker tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ${PROJECT}-${SCHEDULER}:${TAG}
# docker tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ${PROJECT}-${SCHEDULER}:${TAG}
docker tag ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG} ${PROJECT}-${NODE_CONTROLLER}:${TAG}

kind-load-images:
Expand All @@ -132,7 +132,7 @@ kind-load-images:
$(KIND) load docker-image ${PROJECT}-${CONTROLLER}:${TAG}
$(KIND) load docker-image ${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
$(KIND) load docker-image ${PROJECT}-${EXTENDER_PATCHER}:${TAG}
$(KIND) load docker-image ${PROJECT}-${SCHEDULER}:${TAG}
# $(KIND) load docker-image ${PROJECT}-${SCHEDULER}:${TAG}
$(KIND) load docker-image ${PROJECT}-${NODE_CONTROLLER}:${TAG}

kind-build:
Expand Down

0 comments on commit d2efc7b

Please sign in to comment.