Skip to content

Commit

Permalink
Merge branch 'fix-build' into 'master'
Browse files Browse the repository at this point in the history
Fix the build and update README

See merge request nvidia/container-toolkit/libnvidia-container!12
  • Loading branch information
RenaudWasTaken committed Nov 12, 2019
2 parents 0fd1450 + 1e72c3a commit c861e8a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <os><version>
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/<os>:<version>`

Without Docker:
```bash
make install
Expand Down
6 changes: 5 additions & 1 deletion mk/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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%:
Expand Down
8 changes: 4 additions & 4 deletions mk/native-elf-format
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down

0 comments on commit c861e8a

Please sign in to comment.