Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

main: Remove hardcoded Clear Containers references #921

Open
sboeuf opened this issue Jan 12, 2018 · 1 comment
Open

main: Remove hardcoded Clear Containers references #921

sboeuf opened this issue Jan 12, 2018 · 1 comment
Assignees
@jodh-intel

Comments

@sboeuf
Copy link
Contributor

sboeuf commented Jan 12, 2018

Every reference to Clear Containers should be configured depending on the configuration used. In case we test Kata, we want the logger name to be kata-runtime instead of cc-runtime. Same thing for references to Clear Containers.
Refer to:
https://github.com/clearcontainers/runtime/blob/master/main.go#L33-L34
@jodh-intel
Copy link
Contributor

Agreed. The most flexible approach would be to define them in the Makefile:

PROJECT_NAME = Intel® Clear Containers
PROJECT_BIN_NAME = cc-runtime

USER_VARS += PROJECT_NAME
USER_VARS += PROJECT_BIN_NAME

And then add the appropriate code to GENERATED_CODE in Makefile so that config-generated.go contains these values, rather than defining them in main.go.

This was referenced Jan 15, 2018
Open
Closed
@jodh-intel jodh-intel self-assigned this Jan 15, 2018
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 17, 2018
@jodh-intel
build: Allow for kata project build
f63d5d2 
Rework the build system to allow the runtime to be built for either of
the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

  $ make build-kata-system
  $ sudo make install-kata-system

Two new variables have also been added:

- KATA_SYSTEM_BUILD: set to any value to build/install for Kata.
- SYSTEM_BUILD_TYPE: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See "make help" for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
@jodh-intel jodh-intel mentioned this issue Jan 17, 2018
Merged
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 17, 2018
@jodh-intel
build: Allow for kata project build
71ff845 
Rework the build system to allow the runtime to be built for either of
the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

  $ make build-kata-system
  $ sudo make install-kata-system

Two new variables have also been added:

- KATA_SYSTEM_BUILD: set to any value to build/install for Kata.
- SYSTEM_BUILD_TYPE: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See "make help" for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 17, 2018
@jodh-intel
build: Allow for kata project build
8be1ed7 
Rework the build system to allow the runtime to be built for either
of the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

```
$ make build-kata-system
$ sudo make install-kata-system
```

Two new variables have also been added:

- `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata.
- `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See `make help` for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 17, 2018
@jodh-intel
build: Allow for kata project build
f5c282c 
Rework the build system to allow the runtime to be built for either
of the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

```
$ make build-kata-system
$ sudo make install-kata-system
```

Two new variables have also been added:

- `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata.
- `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See `make help` for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 18, 2018
@jodh-intel
build: Allow for kata project build
6cc2899 
Rework the build system to allow the runtime to be built for either
of the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

```
$ make build-kata-system
$ sudo make install-kata-system
```

Two new variables have also been added:

- `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata.
- `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See `make help` for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 18, 2018
@jodh-intel
build: Allow for kata project build
4898b84 
Rework the build system to allow the runtime to be built for either
of the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

```
$ make build-kata-system
$ sudo make install-kata-system
```

Two new variables have also been added:

- `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata.
- `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See `make help` for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
jodh-intel added a commit to jodh-intel/runtime that referenced this issue Jan 18, 2018
@jodh-intel
build: Allow for kata project build
7a9a492 
Rework the build system to allow the runtime to be built for either
of the following:

- Clear Containers (`cc-runtime` binary and configuration)
- Kata Containers (`kata-runtime` binary and configuration)

The existing build rules are retained but there are now two new rules:

```
$ make build-kata-system
$ sudo make install-kata-system
```

Two new variables have also been added:

- `KATA_SYSTEM_BUILD`: set to any value to build/install for Kata.
- `SYSTEM_BUILD_TYPE`: build for either Clear Containers (set to `cc`) or
  Kata (set to `kata`).

See `make help` for further details.

Note that configuration files are installed to a project-specific
directory, allowing for systems to be installed for both Kata and Clear
Containers.

Finally, the bash completion and collection scripts have been updated
to work for either project.

Fixes clearcontainers#919, clearcontainers#921.

Signed-off-by: James O. D. Hunt <[email protected]>
mcastelino pushed a commit to mcastelino/runtime that referenced this issue Dec 6, 2018
cli: Fix console for big endian architecture
bf56858 
The function ioctl can lead to a big endian bug.
Issue already solved in containerd/console:
containerd/console@dbd69c5

Fixes: clearcontainers#921

Signed-off-by: Alice Frosi <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jodh-intel jodh-intel

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jodh-intel @sboeuf