diff --git a/container/eventlog-server/Dockerfile b/container/ccnp-eventlog-server/Dockerfile similarity index 100% rename from container/eventlog-server/Dockerfile rename to container/ccnp-eventlog-server/Dockerfile diff --git a/container/measurement-server/Dockerfile b/container/ccnp-measurement-server/Dockerfile similarity index 100% rename from container/measurement-server/Dockerfile rename to container/ccnp-measurement-server/Dockerfile diff --git a/container/quote-server/Dockerfile b/container/ccnp-quote-server/Dockerfile similarity index 100% rename from container/quote-server/Dockerfile rename to container/ccnp-quote-server/Dockerfile diff --git a/deployment/README.md b/deployment/README.md index 4f0af44c..cddcfac5 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -25,7 +25,7 @@ TBD The following scripts can help to generate CCNP images and deploy them in the TD nodes. -- [image-manager.sh](../deployment/script/image-manager.sh): The tool will build 5 images and push them to remote registry if required. +- [build.sh](../container/build.sh): The tool will build docker images and push them to remote registry if required. - [deploy-ccnp.sh](../deployment/script/deploy-ccnp.sh): The tool will deploy CCNP services as DaemonSet on TDs in the K8S cluster. - [deploy-and-exec-ccnp-example.sh](../deployment/script/deploy-and-exec-ccnp-example.sh): The tool will deploy an example pod and show getting event logs, measurement and perform verification using CCNP in the pod. @@ -61,21 +61,21 @@ Run below scripts to generate CCNP images. It will generate 5 images and push th _NOTE: The scripts need to run on a server with docker installed._ ``` -$ cd scripts -$ sudo ./image-manager.sh -r -g +$ cd container +$ sudo ./build.sh -r -g e.g. # Build images with tag 0.3 and push them to remote registry test-registry.intel.com -$ sudo ./image-manager.sh -r test-registry.intel.com/test -g 0.3 +$ sudo ./build.sh -r test-registry.intel.com/test -g 0.3 # Build images only with tag 0.3 -$ sudo ./image-manager.sh -a build -g 0.3 +$ sudo ./build.sh -a build -g 0.3 ``` _NOTE: please set `HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY` in your terminal if they are needed in your environments._ -After the script is successful, it's supposed to see below docker images. +After the script is successful, it's supposed to see below docker images for CCNP. ``` $ sudo docker images diff --git a/device-plugin/ccnp-device-plugin/README.md b/device-plugin/ccnp-device-plugin/README.md index 11a9365f..ac2c6447 100644 --- a/device-plugin/ccnp-device-plugin/README.md +++ b/device-plugin/ccnp-device-plugin/README.md @@ -93,12 +93,12 @@ Above label can be used as node selector by CCNP device plugin daemonset and CCN The Dockerfile for the service can be found under container/ccnp-device-plugin directory. Use the following command to build the image under confidential-cloud-native-primitives directory: ``` -docker build -t ccnp-device-plugin:0.1 -f container/ccnp-device-plugin/Dockerfile . +docker build -t ccnp-device-plugin: -f container/ccnp-device-plugin/Dockerfile . ``` > Note: if you are using containerd as the default runtime for kubernetes, don't forget to use the following commands to import the image into containerd first: ``` -docker save -o ccnp-device-plugin.tar ccnp-device-plugin:0.1 +docker save -o ccnp-device-plugin.tar ccnp-device-plugin: ctr -n=k8s.io image import ccnp-device-plugin.tar ``` diff --git a/docs/ccnp-deployment-process.png b/docs/ccnp-deployment-process.png index 5d897c84..c05eeb2c 100644 Binary files a/docs/ccnp-deployment-process.png and b/docs/ccnp-deployment-process.png differ diff --git a/service/eventlog-server/README.md b/service/eventlog-server/README.md index 8cf98f40..ea1f9086 100644 --- a/service/eventlog-server/README.md +++ b/service/eventlog-server/README.md @@ -58,15 +58,15 @@ User need to have a kubernetes cluster ready to deploy the service. To simplify ### Build docker image -The dockerfile for the service can be found under `container/eventlog-server` directory. Use the following command to build the image: +The dockerfile for the service can be found under `container/ccnp-eventlog-server` directory. Use the following command to build the image: ``` cd ../.. -docker build -t ccnp-eventlog-server:0.1 -f container/eventlog-server/Dockerfile . +docker build -t ccnp-eventlog-server: -f container/ccnp-eventlog-server/Dockerfile . ``` > Note: if you are using containerd as the default runtime for kubernetes. Please remember to use the following commands to import the image into containerd first: ``` -docker save -o ccnp-eventlog-server.tar ccnp-eventlog-server:0.1 +docker save -o ccnp-eventlog-server.tar ccnp-eventlog-server: ctr -n=k8s.io image import ccnp-eventlog-server.tar ``` diff --git a/service/measurement-server/README.md b/service/measurement-server/README.md index e3296be7..bd292d38 100644 --- a/service/measurement-server/README.md +++ b/service/measurement-server/README.md @@ -61,15 +61,15 @@ Also, the ccnp device plugin need to installed before the installation of measur ### Build docker image -The dockerfile for the service can be found under `container/measurement-server` directory. Use the following command to build the image: +The dockerfile for the service can be found under `container/ccnp-measurement-server` directory. Use the following command to build the image: ``` cd ../.. -docker build -t ccnp-measurement-server:0.1 -f container/measurement-server/Dockerfile . +docker build -t ccnp-measurement-server: -f container/ccnp-measurement-server/Dockerfile . ``` > Note: if you are using containerd as the default runtime for kubernetes. Please remember to use the following commands to import the image into containerd first: ``` -docker save -o ccnp-measurement-server.tar ccnp-measurement-server:0.1 +docker save -o ccnp-measurement-server.tar ccnp-measurement-server: ctr -n=k8s.io image import ccnp-measurement-server.tar ``` diff --git a/service/quote-server/README.md b/service/quote-server/README.md index d57378a5..3d80a105 100644 --- a/service/quote-server/README.md +++ b/service/quote-server/README.md @@ -47,15 +47,15 @@ User need to have a kubernetes cluster ready to deploy the services. To simplify Also, the ccnp device plugin need to installed before the installation of quote server. Please refer to its [deployment guide](../../device-plugin/ccnp-device-plugin/README.md) for installation. ### Build docker image -The Dockerfile for the service can be found under `container/quote-server` directory. Use the following command to build the image: +The Dockerfile for the service can be found under `container/ccnp-quote-server` directory. Use the following command to build the image: ``` -docker build -t ccnp-quote-server:0.1 -f container/quote-server/Dockerfile . +docker build -t ccnp-quote-server: -f container/ccnp-quote-server/Dockerfile . ``` > Note: if you are using containerd as the default runtime for kubernetes, don't forget to use the following commands to import the image into containerd first: ``` -docker save -o ccnp-quote-server.tar ccnp-quote-server:0.1 +docker save -o ccnp-quote-server.tar ccnp-quote-server: ctr -n=k8s.io image import ccnp-quote-server.tar ```