Rename weaveworks/pluginv2 to weaveworks/net-plugin
This commit is contained in:
1 parent
e852ae99ca
commit
16062ea62d
2 files changed
+22
-22
No files matched your search
@@ -105,7 +105,7 @@ EXES=$(WEAVER_EXE) $(SIGPROXY_EXE) $(KUBEPEERS_EXE) $(WEAVENPC_EXE) $(WEAVEPROXY
|
|||||||
BUILD_UPTODATE=.build.uptodate
|
BUILD_UPTODATE=.build.uptodate
|
||||||
WEAVER_UPTODATE=.weaver$(ARCH_EXT).uptodate
|
WEAVER_UPTODATE=.weaver$(ARCH_EXT).uptodate
|
||||||
WEAVEEXEC_UPTODATE=.weaveexec$(ARCH_EXT).uptodate
|
WEAVEEXEC_UPTODATE=.weaveexec$(ARCH_EXT).uptodate
|
||||||
PLUGINV2_UPTODATE=.pluginv2$(ARCH_EXT).uptodate
|
PLUGIN_UPTODATE=.net-plugin$(ARCH_EXT).uptodate
|
||||||
WEAVEKUBE_UPTODATE=.weavekube$(ARCH_EXT).uptodate
|
WEAVEKUBE_UPTODATE=.weavekube$(ARCH_EXT).uptodate
|
||||||
WEAVENPC_UPTODATE=.weavenpc$(ARCH_EXT).uptodate
|
WEAVENPC_UPTODATE=.weavenpc$(ARCH_EXT).uptodate
|
||||||
WEAVEDB_UPTODATE=.weavedb.uptodate
|
WEAVEDB_UPTODATE=.weavedb.uptodate
|
||||||
@@ -119,11 +119,12 @@ WEAVEKUBE_IMAGE=$(DOCKERHUB_USER)/weave-kube$(ARCH_EXT)
|
|||||||
WEAVENPC_IMAGE=$(DOCKERHUB_USER)/weave-npc$(ARCH_EXT)
|
WEAVENPC_IMAGE=$(DOCKERHUB_USER)/weave-npc$(ARCH_EXT)
|
||||||
BUILD_IMAGE=weaveworks/weavebuild
|
BUILD_IMAGE=weaveworks/weavebuild
|
||||||
WEAVEDB_IMAGE=$(DOCKERHUB_USER)/weavedb
|
WEAVEDB_IMAGE=$(DOCKERHUB_USER)/weavedb
|
||||||
PLUGINV2_IMAGE=$(DOCKERHUB_USER)/pluginv2$(ARCH_EXT)
|
PLUGIN_IMAGE=$(DOCKERHUB_USER)/net-plugin
|
||||||
|
|
||||||
IMAGES=$(WEAVER_IMAGE) $(WEAVEEXEC_IMAGE) $(WEAVEKUBE_IMAGE) $(WEAVENPC_IMAGE) $(WEAVEDB_IMAGE)
|
IMAGES=$(WEAVER_IMAGE) $(WEAVEEXEC_IMAGE) $(WEAVEKUBE_IMAGE) $(WEAVENPC_IMAGE) $(WEAVEDB_IMAGE)
|
||||||
|
|
||||||
PLUGINV2_WORK_DIR="prog/plugin-v2/rootfs"
|
PLUGIN_WORK_DIR="prog/plugin-v2/rootfs"
|
||||||
|
PLUGIN_BUILD_IMG="plugin-builder"
|
||||||
|
|
||||||
PUBLISH=publish_weave publish_weaveexec publish_plugin publish_weave-kube publish_weave-npc
|
PUBLISH=publish_weave publish_weaveexec publish_plugin publish_weave-kube publish_weave-npc
|
||||||
PUSH_ML=push_ml_weave push_ml_weaveexec push_ml_plugin push_ml_weave-kube push_ml_weave-npc
|
PUSH_ML=push_ml_weave push_ml_weaveexec push_ml_plugin push_ml_weave-kube push_ml_weave-npc
|
||||||
@@ -265,19 +266,18 @@ $(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) prog/weaveexe
|
|||||||
$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker build -f prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) -t $(WEAVEEXEC_IMAGE) prog/weaveexec
|
$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker build -f prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) -t $(WEAVEEXEC_IMAGE) prog/weaveexec
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
# TODO(mp) cleanup!
|
$(PLUGIN_UPTODATE): prog/plugin-v2/launch.sh prog/plugin-v2/config.json $(WEAVER_UPTODATE)
|
||||||
pluginv2: prog/plugin-v2/launch.sh prog/plugin-v2/config.json $(WEAVER_UPTODATE)
|
-$(SUDO) docker rm -f $(PLUGIN_BUILD_IMG) 2>/dev/null
|
||||||
-$(SUDO) docker rm -f buildpluginv2
|
$(SUDO) docker create --name=$(PLUGIN_BUILD_IMG) $(WEAVER_IMAGE) true
|
||||||
$(SUDO) docker create --name=buildpluginv2 $(WEAVER_IMAGE) true
|
rm -rf $(PLUGIN_WORK_DIR)
|
||||||
rm -rf $(PLUGINV2_WORK_DIR)
|
mkdir $(PLUGIN_WORK_DIR)
|
||||||
mkdir $(PLUGINV2_WORK_DIR)
|
docker export $(PLUGIN_BUILD_IMG) | tar -x -C $(PLUGIN_WORK_DIR)
|
||||||
docker export buildpluginv2 | tar -x -C $(PLUGINV2_WORK_DIR)
|
docker rm -f $(PLUGIN_BUILD_IMG)
|
||||||
docker rm buildpluginv2
|
cp prog/plugin-v2/launch.sh $(PLUGIN_WORK_DIR)/home/weave/launch.sh
|
||||||
cp prog/plugin-v2/launch.sh $(PLUGINV2_WORK_DIR)/home/weave/launch.sh
|
-docker plugin disable $(PLUGIN_IMAGE) 2>/dev/null
|
||||||
-docker plugin disable $(PLUGINV2_IMAGE)
|
-docker plugin rm $(PLUGIN_IMAGE) 2>/dev/null
|
||||||
-docker plugin rm $(PLUGINV2_IMAGE)
|
docker plugin create $(PLUGIN_IMAGE) prog/plugin-v2
|
||||||
docker plugin create $(PLUGINV2_IMAGE) prog/plugin-v2
|
touch $@
|
||||||
#touch $@
|
|
||||||
|
|
||||||
$(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(WEAVER_UPTODATE)
|
$(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(WEAVER_UPTODATE)
|
||||||
cp $(KUBEPEERS_EXE) prog/weave-kube/
|
cp $(KUBEPEERS_EXE) prog/weave-kube/
|
||||||
@@ -357,7 +357,7 @@ ifneq ($(UPDATE_LATEST),false)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
clean-work-dir:
|
clean-work-dir:
|
||||||
rm -rf $(PLUGINV2_WORK_DIR)
|
rm -rf $(PLUGIN_WORK_DIR)
|
||||||
|
|
||||||
clean-bin:
|
clean-bin:
|
||||||
-$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker rmi $(IMAGES)
|
-$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker rmi $(IMAGES)
|
||||||
|
|||||||
@@ -335,7 +335,7 @@ BASE_IMAGE=$DOCKERHUB_USER/weave
|
|||||||
IMAGE=$BASE_IMAGE:$IMAGE_VERSION
|
IMAGE=$BASE_IMAGE:$IMAGE_VERSION
|
||||||
CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
|
CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
|
||||||
|
|
||||||
PLUGIN_V2_NAME="$DOCKERHUB_USER/pluginv2"
|
PLUGIN_NAME="$DOCKERHUB_USER/net-plugin"
|
||||||
CNI_PLUGIN_NAME="weave-plugin-$IMAGE_VERSION"
|
CNI_PLUGIN_NAME="weave-plugin-$IMAGE_VERSION"
|
||||||
CNI_PLUGIN_DIR=${WEAVE_CNI_PLUGIN_DIR:-$HOST_ROOT/opt/cni/bin}
|
CNI_PLUGIN_DIR=${WEAVE_CNI_PLUGIN_DIR:-$HOST_ROOT/opt/cni/bin}
|
||||||
# Note VOLUMES_CONTAINER which is for weavewait should change when you upgrade Weave
|
# Note VOLUMES_CONTAINER which is for weavewait should change when you upgrade Weave
|
||||||
@@ -884,15 +884,15 @@ attach() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_not_running_v2_plugin() {
|
check_not_running_v2_plugin() {
|
||||||
if is_docker_plugin_enabled $PLUGIN_V2_NAME; then
|
if is_docker_plugin_enabled $PLUGIN_NAME; then
|
||||||
echo "Docker plugin \"$PLUGIN_V2_NAME\" is already running." >&2
|
echo "Docker plugin \"$PLUGIN_NAME\" is already running." >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Docker Plugin V2
|
# Docker Plugin V2
|
||||||
is_docker_plugin_enabled() {
|
is_docker_plugin_enabled() {
|
||||||
util_op is-docker-plugin-enabled $PLUGIN_V2_NAME 2>/dev/null
|
util_op is-docker-plugin-enabled $PLUGIN_NAME 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
# Docker Plugin (part of weaver process, so V2 or V1).
|
# Docker Plugin (part of weaver process, so V2 or V1).
|
||||||
@@ -2058,7 +2058,7 @@ EOF
|
|||||||
if [ -z "$SUB_STATUS" ] && is_docker_plugin_enabled ; then
|
if [ -z "$SUB_STATUS" ] && is_docker_plugin_enabled ; then
|
||||||
echo
|
echo
|
||||||
echo " Service: plugin"
|
echo " Service: plugin"
|
||||||
echo " DriverName: $PLUGIN_V2_NAME"
|
echo " DriverName: $PLUGIN_NAME"
|
||||||
elif [ -z "$SUB_STATUS" ] && is_plugin_enabled ; then
|
elif [ -z "$SUB_STATUS" ] && is_plugin_enabled ; then
|
||||||
echo
|
echo
|
||||||
echo " Service: plugin"
|
echo " Service: plugin"
|
||||||
|
|||||||
Reference in new issue
Block a user