diff --git a/README.md b/README.md index e1ff6fb4..0da4f7a1 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,26 @@ The implementation relies on kernel primitives and is designed to be agnostic of ## Installing the library ### From packages -Refer to the [repository configuration](https://nvidia.github.io/libnvidia-container/) for your Linux distribution. +Configure the [package repository](https://nvidia.github.io/libnvidia-container/) for your Linux distribution. + +Install the packages: +```bash +libnvidia-container1 +libnvidia-container-tools +``` ### From sources With Docker: ```bash -# Generate packages for a given distribution in the dist/ directory -make docker-ubuntu:16.04 +# Generate docker images for a supported +make {ubuntu18.04, ubuntu16.04, debian10, debian9, centos7, amazonlinux1, amazonlinux2, opensuse-leap15.1} + +# Or generate docker images for all supported distributions in the dist/ directory +make docker ```` +The resulting images have the name `nvidia/libnvidia-container/:` + Without Docker: ```bash make install diff --git a/mk/docker.mk b/mk/docker.mk index 450e14e5..515d4992 100644 --- a/mk/docker.mk +++ b/mk/docker.mk @@ -13,8 +13,12 @@ # limitations under the License. # +DOCKER_TARGETS = ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1 + docker: SHELL:=/bin/bash -docker: ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1 +docker: $(DOCKER_TARGETS) + +$(DOCKER_TARGETS): # Added to explicity define possible targets for bash completion ubuntu%: ARCH := amd64 ubuntu%: diff --git a/mk/native-elf-format b/mk/native-elf-format old mode 100644 new mode 100755 index 581654c3..64331536 --- a/mk/native-elf-format +++ b/mk/native-elf-format @@ -25,10 +25,10 @@ $1 ~ "Class:" { } $1 ~ "Data:" { if (match($0, "little")) { - elfdata = "LSB"; - } else { - elfdata = "MSB"; - } + elfdata = "LSB"; + } else { + elfdata = "MSB"; + } } $1 ~ "Machine:" { if (match($0, "Intel.*386")) {