Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

Update container dir name to align with deployment image names #224

Merged
merged 2 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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 <remote registry> -g <docker image tag>
$ cd container
$ sudo ./build.sh -r <remote registry> -g <docker image tag>

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
Expand Down
4 changes: 2 additions & 2 deletions device-plugin/ccnp-device-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:<your image tag> -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:<your image tag>
ctr -n=k8s.io image import ccnp-device-plugin.tar
```

Expand Down
Binary file modified docs/ccnp-deployment-process.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions service/eventlog-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:<your image tag> -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:<your image tag>
ctr -n=k8s.io image import ccnp-eventlog-server.tar
```

Expand Down
6 changes: 3 additions & 3 deletions service/measurement-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:<your image tag> -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:<your image tag>
ctr -n=k8s.io image import ccnp-measurement-server.tar
```

Expand Down
6 changes: 3 additions & 3 deletions service/quote-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:<your image tag> -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:<your image tag>
ctr -n=k8s.io image import ccnp-quote-server.tar
```

Expand Down