Commit 48c080c4 authored by songlinfeng's avatar songlinfeng
Browse files

rename dcu-ctk dcu-container-toolkit

parent 0ccfece1
...@@ -6,9 +6,9 @@ package modifier ...@@ -6,9 +6,9 @@ package modifier
import ( import (
"bufio" "bufio"
"dtk-container-toolkit/internal/config/image" "dcu-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/oci" "dcu-container-toolkit/internal/oci"
"errors" "errors"
"fmt" "fmt"
"os" "os"
...@@ -158,7 +158,7 @@ func (m sysfsMountModifier) Modify(spec *specs.Spec) error { ...@@ -158,7 +158,7 @@ func (m sysfsMountModifier) Modify(spec *specs.Spec) error {
if len(links) != 0 { if len(links) != 0 {
var args []string var args []string
args = append(args, "dtk-ctk", "hook", "create-symlinks") args = append(args, "dcu-ctk", "hook", "create-symlinks")
for _, l := range links { for _, l := range links {
args = append(args, "--link", l) args = append(args, "--link", l)
} }
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package oci package oci
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"fmt" "fmt"
) )
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package oci package oci
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"fmt" "fmt"
) )
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package oci package oci
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"fmt" "fmt"
"os" "os"
) )
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package oci package oci
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"fmt" "fmt"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
package dhcu package dhcu
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"dtk-container-toolkit/internal/info/drm" "dcu-container-toolkit/internal/info/drm"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"dtk-container-toolkit/pkg/go-c3000lib/pkg/device" "dcu-container-toolkit/pkg/go-c3000lib/pkg/device"
"fmt" "fmt"
) )
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
package dhcu package dhcu
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/pkg/go-c3000lib/pkg/device" "dcu-container-toolkit/pkg/go-c3000lib/pkg/device"
"errors" "errors"
) )
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package dhcu package dhcu
import ( import (
"dtk-container-toolkit/internal/c3000caps" "dcu-container-toolkit/internal/c3000caps"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
) )
type options struct { type options struct {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package runtime package runtime
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"errors" "errors"
"fmt" "fmt"
"io" "io"
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
package runtime package runtime
import ( import (
"dtk-container-toolkit/internal/config" "dcu-container-toolkit/internal/config"
"dtk-container-toolkit/internal/info" "dcu-container-toolkit/internal/info"
"dtk-container-toolkit/internal/lookup/root" "dcu-container-toolkit/internal/lookup/root"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
...@@ -48,7 +48,7 @@ func (r rt) Run(argv []string) (rerr error) { ...@@ -48,7 +48,7 @@ func (r rt) Run(argv []string) (rerr error) {
} }
}() }()
//nolint:staticcheck // TODO(elezar): We should switch the dtk-container-runtime from using dtk-ctk to using dtk-cdi-hook. //nolint:staticcheck // TODO(elezar): We should switch the dcu-container-runtime from using dcu-ctk to using dcu-cdi-hook.
cfg.DTKCTKConfig.Path = config.ResolveDTKCDIHookPath(r.logger, cfg.DTKCTKConfig.Path) cfg.DTKCTKConfig.Path = config.ResolveDTKCDIHookPath(r.logger, cfg.DTKCTKConfig.Path)
// Print the config to the output. // Print the config to the output.
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
package runtime package runtime
import ( import (
"dtk-container-toolkit/internal/config" "dcu-container-toolkit/internal/config"
"dtk-container-toolkit/internal/config/image" "dcu-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/info" "dcu-container-toolkit/internal/info"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup/root" "dcu-container-toolkit/internal/lookup/root"
"dtk-container-toolkit/internal/modifier" "dcu-container-toolkit/internal/modifier"
"dtk-container-toolkit/internal/oci" "dcu-container-toolkit/internal/oci"
"fmt" "fmt"
) )
......
Source: dtk-container-toolkit Source: dcu-container-toolkit
Section: @SECTION@utils Section: @SECTION@utils
Priority: optional Priority: optional
Maintainer: DTK HCU Opt Devops Maintainer: DTK HCU Opt Devops
Standards-Version: 1.1.0 Standards-Version: 1.1.0
Build-Depends: debhelper (>= 9) Build-Depends: debhelper (>= 9)
Package: dtk-container-toolkit Package: dcu-container-toolkit
Architecture: any Architecture: any
Description: DTK Container toolkit Description: DTK Container toolkit
Provides tools and utilities to enable HCU support in containers. Provides tools and utilities to enable HCU support in containers.
\ No newline at end of file
dcu-container-runtime /usr/bin
dcu-ctk /usr/bin
dcu-cdi-hook /usr/bin
...@@ -6,12 +6,12 @@ NVIDIA_CONTAINER_RUNTIME_HOOK=/usr/bin/nvidia-container-runtime-hook ...@@ -6,12 +6,12 @@ NVIDIA_CONTAINER_RUNTIME_HOOK=/usr/bin/nvidia-container-runtime-hook
case "$1" in case "$1" in
configure) configure)
/usr/bin/dtk-ctk --quiet config --config-file=/etc/dtk-container-runtime/config.toml --in-place /usr/bin/dcu-ctk --quiet config --config-file=/etc/dcu-container-runtime/config.toml --in-place
if [ ! -e "${NVIDIA_CONTAINER_RUNTIME_HOOK}" ]; then if [ ! -e "${NVIDIA_CONTAINER_RUNTIME_HOOK}" ]; then
ln -s /usr/bin/dtk-ctk $NVIDIA_CONTAINER_RUNTIME_HOOK ln -s /usr/bin/dcu-ctk $NVIDIA_CONTAINER_RUNTIME_HOOK
fi fi
/usr/bin/dtk-ctk runtime configure --runtime=docker --set-as-default /usr/bin/dcu-ctk runtime configure --runtime=docker --set-as-default
echo -e "\e[032m ================================== \e[0m" echo -e "\e[032m ================================== \e[0m"
echo -e "\e[033m Please restart Docker service: \e[0m" echo -e "\e[033m Please restart Docker service: \e[0m"
echo -e "\e[033m sudo systemctl restart docker \e[0m" echo -e "\e[033m sudo systemctl restart docker \e[0m"
......
dtk-container-runtime /usr/bin
dtk-ctk /usr/bin
dtk-cdi-hook /usr/bin
Name: dtk-container-toolkit Name: dcu-container-toolkit
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Group: Development Tools Group: Development Tools
...@@ -9,11 +9,11 @@ Packager: HCUOpt CORPORATION ...@@ -9,11 +9,11 @@ Packager: HCUOpt CORPORATION
Summary: DTK Container Toolkit Summary: DTK Container Toolkit
License: Apache-2.0 License: Apache-2.0
Source0: dtk-ctk Source0: dcu-ctk
Source1: dtk-container-runtime Source1: dcu-container-runtime
Source2: dtk-cdi-hook Source2: dcu-cdi-hook
Source3: LICENSE Source3: LICENSE
Source4: dtk-docker Source4: dcu-docker
%description %description
Provides tools and utilities to enable HCU support in containers. Provides tools and utilities to enable HCU support in containers.
...@@ -23,21 +23,21 @@ cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . ...@@ -23,21 +23,21 @@ cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
%install %install
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -m 755 -t %{buildroot}%{_bindir} dtk-container-runtime install -m 755 -t %{buildroot}%{_bindir} dcu-container-runtime
install -m 755 -t %{buildroot}%{_bindir} dtk-ctk install -m 755 -t %{buildroot}%{_bindir} dcu-ctk
install -m 755 -t %{buildroot}%{_bindir} dtk-cdi-hook install -m 755 -t %{buildroot}%{_bindir} dcu-cdi-hook
install -m 755 -t %{buildroot}%{_bindir} dtk-docker install -m 755 -t %{buildroot}%{_bindir} dcu-docker
%posttrans %posttrans
if [ ! -e %{_bindir}/nvidia-container-runtime-hook ]; then if [ ! -e %{_bindir}/nvidia-container-runtime-hook ]; then
# repairing lost file nvidia-container-runtime-hook # repairing lost file nvidia-container-runtime-hook
ln -sf %{_bindir}/dtk-container-runtime %{_bindir}/nvidia-container-runtime-hook ln -sf %{_bindir}/dcu-container-runtime %{_bindir}/nvidia-container-runtime-hook
fi fi
# Generate the default config; If this file already exists no changes are made. # Generate the default config; If this file already exists no changes are made.
%{_bindir}/dtk-ctk --quiet config --config-file=%{_sysconfdir}/dtk-container-runtime/config.toml --in-place %{_bindir}/dcu-ctk --quiet config --config-file=%{_sysconfdir}/dcu-container-runtime/config.toml --in-place
%{_bindir}/dtk-ctk runtime configure --runtime=docker --set-as-default %{_bindir}/dcu-ctk runtime configure --runtime=docker --set-as-default
echo -e "\e[032m ================================== \e[0m" echo -e "\e[032m ================================== \e[0m"
echo -e "\e[033m Please restart Docker service: \e[0m" echo -e "\e[033m Please restart Docker service: \e[0m"
echo -e "\e[033m sudo systemctl restart docker \e[0m" echo -e "\e[033m sudo systemctl restart docker \e[0m"
...@@ -51,10 +51,10 @@ fi ...@@ -51,10 +51,10 @@ fi
%files %files
%license LICENSE %license LICENSE
%{_bindir}/dtk-ctk %{_bindir}/dcu-ctk
%{_bindir}/dtk-container-runtime %{_bindir}/dcu-container-runtime
%{_bindir}/dtk-cdi-hook %{_bindir}/dcu-cdi-hook
%{_bindir}/dtk-docker %{_bindir}/dcu-docker
%changelog %changelog
* %{release_date} HCUOpt CORPORATION %{version}-%{release} * %{release_date} HCUOpt CORPORATION %{version}-%{release}
- initialize version - initialize version
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package c3000cdi package c3000cdi
import ( import (
"dtk-container-toolkit/pkg/c3000cdi/spec" "dcu-container-toolkit/pkg/c3000cdi/spec"
"dtk-container-toolkit/pkg/go-c3000lib/pkg/device" "dcu-container-toolkit/pkg/go-c3000lib/pkg/device"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
package c3000cdi package c3000cdi
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"dtk-container-toolkit/internal/edits" "dcu-container-toolkit/internal/edits"
"dtk-container-toolkit/internal/platform-support/dhcu" "dcu-container-toolkit/internal/platform-support/dhcu"
"dtk-container-toolkit/internal/config/image" "dcu-container-toolkit/internal/config/image"
"dtk-container-toolkit/pkg/c3000cdi/spec" "dcu-container-toolkit/pkg/c3000cdi/spec"
"dtk-container-toolkit/pkg/go-c3000lib/pkg/device" "dcu-container-toolkit/pkg/go-c3000lib/pkg/device"
"fmt" "fmt"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
package c3000cdi package c3000cdi
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup/root" "dcu-container-toolkit/internal/lookup/root"
"dtk-container-toolkit/pkg/c3000cdi/transform" "dcu-container-toolkit/pkg/c3000cdi/transform"
"dtk-container-toolkit/pkg/go-c3000lib/pkg/device" "dcu-container-toolkit/pkg/go-c3000lib/pkg/device"
"dtk-container-toolkit/pkg/go-c3000smi/pkg/c3000smi" "dcu-container-toolkit/pkg/go-c3000smi/pkg/c3000smi"
"fmt" "fmt"
) )
...@@ -51,7 +51,7 @@ func New(opts ...Option) (Interface, error) { ...@@ -51,7 +51,7 @@ func New(opts ...Option) (Interface, error) {
l.deviceNamers = []DeviceNamer{indexNamer} l.deviceNamers = []DeviceNamer{indexNamer}
} }
if l.dtkCDIHookPath == "" { if l.dtkCDIHookPath == "" {
l.dtkCDIHookPath = "/usr/bin/dtk-cdi-hook" l.dtkCDIHookPath = "/usr/bin/dcu-cdi-hook"
} }
if l.driverRoot == "" { if l.driverRoot == "" {
l.driverRoot = "/" l.driverRoot = "/"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment