Skip to content

Commit c861e8a

Browse files
Merge branch 'fix-build' into 'master'
Fix the build and update README See merge request nvidia/container-toolkit/libnvidia-container!12
2 parents 0fd1450 + 1e72c3a commit c861e8a

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

README.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,26 @@ The implementation relies on kernel primitives and is designed to be agnostic of
1212

1313
## Installing the library
1414
### From packages
15-
Refer to the [repository configuration](https://nvidia.github.io/libnvidia-container/) for your Linux distribution.
15+
Configure the [package repository](https://nvidia.github.io/libnvidia-container/) for your Linux distribution.
16+
17+
Install the packages:
18+
```bash
19+
libnvidia-container1
20+
libnvidia-container-tools
21+
```
1622

1723
### From sources
1824
With Docker:
1925
```bash
20-
# Generate packages for a given distribution in the dist/ directory
21-
make docker-ubuntu:16.04
26+
# Generate docker images for a supported <os><version>
27+
make {ubuntu18.04, ubuntu16.04, debian10, debian9, centos7, amazonlinux1, amazonlinux2, opensuse-leap15.1}
28+
29+
# Or generate docker images for all supported distributions in the dist/ directory
30+
make docker
2231
````
2332

33+
The resulting images have the name `nvidia/libnvidia-container/<os>:<version>`
34+
2435
Without Docker:
2536
```bash
2637
make install

mk/docker.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
# limitations under the License.
1414
#
1515

16+
DOCKER_TARGETS = ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1
17+
1618
docker: SHELL:=/bin/bash
17-
docker: ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1
19+
docker: $(DOCKER_TARGETS)
20+
21+
$(DOCKER_TARGETS): # Added to explicity define possible targets for bash completion
1822

1923
ubuntu%: ARCH := amd64
2024
ubuntu%:

mk/native-elf-format

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ $1 ~ "Class:" {
2525
}
2626
$1 ~ "Data:" {
2727
if (match($0, "little")) {
28-
elfdata = "LSB";
29-
} else {
30-
elfdata = "MSB";
31-
}
28+
elfdata = "LSB";
29+
} else {
30+
elfdata = "MSB";
31+
}
3232
}
3333
$1 ~ "Machine:" {
3434
if (match($0, "Intel.*386")) {

0 commit comments

Comments
 (0)