mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-25 13:35:00 +00:00
Add changelog entry for config.json path changes
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
23bdcbc818
commit
5996379fcc
@ -18,7 +18,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@ -29,15 +28,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestArgsGetConfigFilePath(t *testing.T) {
|
func TestArgsGetConfigFilePath(t *testing.T) {
|
||||||
wd, err := os.Getwd()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
bundleDir string
|
bundleDir string
|
||||||
ociSpecPath string
|
ociSpecPath string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
ociSpecPath: fmt.Sprintf("%v/config.json", wd),
|
ociSpecPath: "config.json",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
bundleDir: "/foo/bar",
|
bundleDir: "/foo/bar",
|
||||||
|
@ -154,11 +154,10 @@ func isBundleFlag(arg string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// getOCISpecFilePath returns the expected path to the OCI specification file for the given
|
// getOCISpecFilePath returns the expected path to the OCI specification file for the given
|
||||||
// bundle directory or the current working directory if not specified.
|
// bundle directory. If the bundle directory is empty, only `config.json` is returned.
|
||||||
func getOCISpecFilePath(bundleDir string) (string, error) {
|
func getOCISpecFilePath(bundleDir string) (string, error) {
|
||||||
logger.Infof("Using bundle directory: %v", bundleDir)
|
logger.Infof("Using bundle directory: %v", bundleDir)
|
||||||
|
|
||||||
// if bundleDir not specified, use "config.json" directly as cwd will always be the bundle path
|
|
||||||
OCISpecFilePath := filepath.Join(bundleDir, ociSpecFileName)
|
OCISpecFilePath := filepath.Join(bundleDir, ociSpecFileName)
|
||||||
|
|
||||||
logger.Infof("Using OCI specification file path: %v", OCISpecFilePath)
|
logger.Infof("Using OCI specification file path: %v", OCISpecFilePath)
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium
|
nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium
|
||||||
|
|
||||||
|
* Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
|
||||||
|
|
||||||
-- NVIDIA CORPORATION <cudatools@nvidia.com> Tue, 26 Oct 2021 12:24:05 +0200
|
-- NVIDIA CORPORATION <cudatools@nvidia.com> Tue, 26 Oct 2021 12:24:05 +0200
|
||||||
|
|
||||||
nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium
|
nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium
|
||||||
|
@ -67,6 +67,8 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
|
|||||||
|
|
||||||
* Tue Oct 26 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2
|
* Tue Oct 26 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2
|
||||||
|
|
||||||
|
- Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
|
||||||
|
|
||||||
* Mon Sep 06 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.1
|
* Mon Sep 06 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.1
|
||||||
|
|
||||||
- Add AARCH64 package for Amazon Linux 2
|
- Add AARCH64 package for Amazon Linux 2
|
||||||
|
Loading…
Reference in New Issue
Block a user