From a774b91267de533ca380805e475679d34744b1a7 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 14 Sep 2016 11:13:49 -0700 Subject: [PATCH] Rename ocitools to oci-runtime-tool Signed-off-by: Mrunal Patel --- .gitignore | 2 +- Godeps/Godeps.json | 2 +- Makefile | 14 +-- README.md | 18 +-- .../generate.go | 2 +- cmd/{ocitools => oci-runtime-tool}/main.go | 0 .../validate.go | 0 cmd/runtimetest/main.go | 2 +- .../bash/{ocitools => oci-runtime-tool} | 106 +++++++++--------- contrib/README.md | 4 +- ...te.1.md => oci-runtime-tool-generate.1.md} | 22 ++-- ...te.1.md => oci-runtime-tool-validate.1.md} | 8 +- man/{ocitools.1.md => oci-runtime-tool.1.md} | 16 +-- test_runtime.sh | 2 +- 14 files changed, 99 insertions(+), 99 deletions(-) rename cmd/{ocitools => oci-runtime-tool}/generate.go (99%) rename cmd/{ocitools => oci-runtime-tool}/main.go (100%) rename cmd/{ocitools => oci-runtime-tool}/validate.go (100%) rename completions/bash/{ocitools => oci-runtime-tool} (73%) rename man/{ocitools-generate.1.md => oci-runtime-tool-generate.1.md} (90%) rename man/{ocitools-validate.1.md => oci-runtime-tool-validate.1.md} (61%) rename man/{ocitools.1.md => oci-runtime-tool.1.md} (64%) diff --git a/.gitignore b/.gitignore index 4f37b3967..408c5e10d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ _testmain.go # Compiled binaries oci -/ocitools +/oci-runtime-tool /runtimetest *.1 diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 68a75381d..d6523eda2 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/opencontainers/ocitools", + "ImportPath": "github.com/opencontainers/runtime-tools", "GoVersion": "go1.4", "GodepVersion": "v74", "Deps": [ diff --git a/Makefile b/Makefile index 76da31e7e..f1a6a7a14 100644 --- a/Makefile +++ b/Makefile @@ -5,25 +5,25 @@ BUILDTAGS= export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH) all: - go build -tags "$(BUILDTAGS)" -o ocitools ./cmd/ocitools + go build -tags "$(BUILDTAGS)" -o oci-runtime-tool ./cmd/oci-runtime-tool go build -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest .PHONY: man man: - go-md2man -in "man/ocitools.1.md" -out "ocitools.1" - go-md2man -in "man/ocitools-generate.1.md" -out "ocitools-generate.1" - go-md2man -in "man/ocitools-validate.1.md" -out "ocitools-validate.1" + go-md2man -in "man/oci-runtime-tool.1.md" -out "oci-runtime-tool.1" + go-md2man -in "man/oci-runtime-tool-generate.1.md" -out "oci-runtime-tool-generate.1" + go-md2man -in "man/oci-runtime-tool-validate.1.md" -out "oci-runtime-tool-validate.1" install: man install -d -m 755 $(BINDIR) - install -m 755 ocitools $(BINDIR) + install -m 755 oci-runtime-tool $(BINDIR) install -d -m 755 $(PREFIX)/share/man/man1 install -m 644 *.1 $(PREFIX)/share/man/man1 install -d -m 755 $(PREFIX)/share/bash-completion/completions - install -m 644 completions/bash/ocitools $(PREFIX)/share/bash-completion/completions + install -m 644 completions/bash/oci-runtime-tool $(PREFIX)/share/bash-completion/completions clean: - rm -f ocitools runtimetest *.1 + rm -f oci-runtime-tool runtimetest *.1 .PHONY: test .gofmt .govet .golint diff --git a/README.md b/README.md index b06dbb3e4..62a62311b 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# ocitools [![Build Status](https://travis-ci.org/opencontainers/ocitools.svg?branch=master)](https://travis-ci.org/opencontainers/ocitools) +# oci-runtime-tool [![Build Status](https://travis-ci.org/opencontainers/oci-runtime-tool.svg?branch=master)](https://travis-ci.org/opencontainers/oci-runtime-tool) -ocitools is a collection of tools for working with the [OCI runtime specification][runtime-spec]. +oci-runtime-tool is a collection of tools for working with the [OCI runtime specification][runtime-spec]. ## Generating an OCI runtime spec configuration files -[`ocitools generate`][generate.1] generates [configuration JSON][config.json] for an [OCI bundle][bundle]. +[`oci-runtime-tool generate`][generate.1] generates [configuration JSON][config.json] for an [OCI bundle][bundle]. [OCI-compatible runtimes][runtime-spec] like [runC][] expect to read the configuration from `config.json`. ```sh -$ ocitools generate --output config.json +$ oci-runtime-tool generate --output config.json $ cat config.json { "ociVersion": "0.5.0", @@ -18,12 +18,12 @@ $ cat config.json ## Validating an OCI bundle -[`ocitools validate`][validate.1] validates an OCI bundle. +[`oci-runtime-tool validate`][validate.1] validates an OCI bundle. The error message will be printed if the OCI bundle failed the validation procedure. ```sh -$ ocitools generate -$ ocitools validate +$ oci-runtime-tool generate +$ oci-runtime-tool validate INFO[0000] Bundle validation succeeded. ``` @@ -49,5 +49,5 @@ Runtime runc passed validation [runC]: https://github.com/opencontainers/runc [runtime-spec]: https://github.com/opencontainers/runtime-spec -[generate.1]: man/ocitools-generate.1.md -[validate.1]: man/ocitools-validate.1.md +[generate.1]: man/oci-runtime-tool-generate.1.md +[validate.1]: man/oci-runtime-tool-validate.1.md diff --git a/cmd/ocitools/generate.go b/cmd/oci-runtime-tool/generate.go similarity index 99% rename from cmd/ocitools/generate.go rename to cmd/oci-runtime-tool/generate.go index 627d41fee..c47b940c0 100644 --- a/cmd/ocitools/generate.go +++ b/cmd/oci-runtime-tool/generate.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/opencontainers/ocitools/generate" rspec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-tools/generate" "github.com/urfave/cli" ) diff --git a/cmd/ocitools/main.go b/cmd/oci-runtime-tool/main.go similarity index 100% rename from cmd/ocitools/main.go rename to cmd/oci-runtime-tool/main.go diff --git a/cmd/ocitools/validate.go b/cmd/oci-runtime-tool/validate.go similarity index 100% rename from cmd/ocitools/validate.go rename to cmd/oci-runtime-tool/validate.go diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go index 9f9ba3532..ec20afc2a 100644 --- a/cmd/runtimetest/main.go +++ b/cmd/runtimetest/main.go @@ -12,8 +12,8 @@ import ( "syscall" "github.com/Sirupsen/logrus" - "github.com/opencontainers/ocitools/cmd/runtimetest/mount" rspec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-tools/cmd/runtimetest/mount" "github.com/syndtr/gocapability/capability" "github.com/urfave/cli" ) diff --git a/completions/bash/ocitools b/completions/bash/oci-runtime-tool similarity index 73% rename from completions/bash/ocitools rename to completions/bash/oci-runtime-tool index 50233c71a..6654bf773 100644 --- a/completions/bash/ocitools +++ b/completions/bash/oci-runtime-tool @@ -1,6 +1,6 @@ #!/bin/bash # -# bash completion file for core ocitools commands +# bash completion file for core oci-runtime-tool commands # # This script provides completion of: # - commands and their options @@ -9,9 +9,9 @@ # To enable the completions either: # - place this file in /usr/share/bash-completion/completions # or -# - copy this file to e.g. ~/.ocitools-completion.sh and add the line +# - copy this file to e.g. ~/.oci-runtime-tool-completion.sh and add the line # below to your .bashrc after bash completion features are loaded -# . ~/.ocitools-completion.sh +# . ~/.oci-runtime-tool-completion.sh # # Configuration: # @@ -22,10 +22,10 @@ # options immediately following their corresponding long form. # This order should be applied to lists, alternatives and code blocks. -__ocitools_previous_extglob_setting=$(shopt -p extglob) +__oci-runtime-tool_previous_extglob_setting=$(shopt -p extglob) shopt -s extglob -__ocitools_pos_first_nonflag() { +__oci-runtime-tool_pos_first_nonflag() { local argument_flags=$1 local counter=$((${subcommand_pos:-${command_pos}} + 1)) @@ -49,8 +49,8 @@ __ocitools_pos_first_nonflag() { # Transforms a multiline list of strings into a single line string # with the words separated by "|". -# This is used to prepare arguments to __ocitools_pos_first_nonflag(). -__ocitools_to_alternatives() { +# This is used to prepare arguments to __oci-runtime-tool_pos_first_nonflag(). +__oci-runtime-tool_to_alternatives() { local parts=( $1 ) local IFS='|' echo "${parts[*]}" @@ -58,8 +58,8 @@ __ocitools_to_alternatives() { # Transforms a multiline list of options into an extglob pattern # suitable for use in case statements. -__ocitools_to_extglob() { - local extglob=$( __ocitools_to_alternatives "$1" ) +__oci-runtime-tool_to_extglob() { + local extglob=$( __oci-runtime-tool_to_alternatives "$1" ) echo "@($extglob)" } @@ -73,16 +73,16 @@ __ocitools_to_extglob() { # TODO if the preceding command has options that accept arguments and an # argument is equal ot one of the subcommands, this is falsely detected as # a match. -__ocitools_subcommands() { +__oci-runtime-tool_subcommands() { local subcommands="$1" local counter=$(($command_pos + 1)) while [ $counter -lt $cword ]; do case "${words[$counter]}" in - $(__ocitools_to_extglob "$subcommands") ) + $(__oci-runtime-tool_to_extglob "$subcommands") ) subcommand_pos=$counter local subcommand=${words[$counter]} - local completions_func=_ocitools_${command}_${subcommand} + local completions_func=_oci-runtime-tool_${command}_${subcommand} declare -F $completions_func >/dev/null && $completions_func return 0 ;; @@ -93,22 +93,22 @@ __ocitools_subcommands() { } # List groups -__ocitools_groups() { +__oci-runtime-tool_groups() { cat /etc/group | cut -d: -f 1 } # List installed hooks -__ocitools_hooks() { +__oci-runtime-tool_hooks() { ls /usr/libexec/oci/hooks.d/* } # suppress trailing whitespace -__ocitools_nospace() { +__oci-runtime-tool_nospace() { # compopt is not available in ancient bash versions type compopt &>/dev/null && compopt -o nospace } -__ocitools_complete_propagations() { +__oci-runtime-tool_complete_propagations() { COMPREPLY=( $( compgen -W " private rprivate @@ -120,8 +120,8 @@ __ocitools_complete_propagations() { } # a selection of the available arches that is most likely of interest in the -# context of ocitools containers. -__ocitools_complete_arches() { +# context of oci-runtime-tool containers. +__oci-runtime-tool_complete_arches() { COMPREPLY=( $( compgen -W " 386 amd64 @@ -130,8 +130,8 @@ __ocitools_complete_arches() { } # a selection of the available arches that is most likely of interest in the -# context of ocitools containers. -__ocitools_complete_seccomp_arches() { +# context of oci-runtime-tool containers. +__oci-runtime-tool_complete_seccomp_arches() { COMPREPLY=( $( compgen -W " SCMP_ARCH_X86 SCMP_ARCH_X86_64 @@ -148,8 +148,8 @@ __ocitools_complete_seccomp_arches() { } # a selection of the available actions that is most likely of interest in the -# context of ocitools containers. -__ocitools_complete_seccomp_actions() { +# context of oci-runtime-tool containers. +__oci-runtime-tool_complete_seccomp_actions() { COMPREPLY=( $( compgen -W " SCMP_ACT_ALLOW SCMP_ACT_ERRNO @@ -158,7 +158,7 @@ __ocitools_complete_seccomp_actions() { SCMP_ACT_TRAP " -- "$cur" ) ) } -__ocitools_complete_capabilities() { +__oci-runtime-tool_complete_capabilities() { # The list of capabilities is defined in types.go, ALL was added manually. COMPREPLY=( $( compgen -W " ALL @@ -204,8 +204,8 @@ __ocitools_complete_capabilities() { } -# global options that may appear after the ocitools command -_ocitools_ocitools() { +# global options that may appear after the oci-runtime-tool command +_oci-runtime-tool_oci-runtime-tool() { local boolean_options=" $global_boolean_options --help @@ -213,7 +213,7 @@ _ocitools_ocitools() { " case "$prev" in - $(__ocitools_to_extglob "$global_options_with_args") ) + $(__oci-runtime-tool_to_extglob "$global_options_with_args") ) return ;; esac @@ -223,7 +223,7 @@ _ocitools_ocitools() { COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) ) ;; *) - local counter=$( __ocitools_pos_first_nonflag $(__ocitools_to_extglob "$global_options_with_args") ) + local counter=$( __oci-runtime-tool_pos_first_nonflag $(__oci-runtime-tool_to_extglob "$global_options_with_args") ) if [ $cword -eq $counter ]; then COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) ) fi @@ -231,7 +231,7 @@ _ocitools_ocitools() { esac } -_ocitools_validate() { +_oci-runtime-tool_validate() { case "$prev" in --path) case "$cur" in @@ -240,11 +240,11 @@ _ocitools_validate() { ;; '') COMPREPLY=( $( compgen -W '/' -- "$cur" ) ) - __ocitools_nospace + __oci-runtime-tool_nospace ;; /*) _filedir - __ocitools_nospace + __oci-runtime-tool_nospace ;; esac return @@ -259,14 +259,14 @@ _ocitools_validate() { } -_ocitools_help() { - local counter=$(__ocitools_pos_first_nonflag) +_oci-runtime-tool_help() { + local counter=$(__oci-runtime-tool_pos_first_nonflag) if [ $cword -eq $counter ]; then COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) ) fi } -_ocitools_generate() { +_oci-runtime-tool_generate() { local options_with_args=" --arch --apparmor @@ -323,27 +323,27 @@ _ocitools_generate() { case "$prev" in --seccomp-arch) - COMPREPLY=( $( compgen -W $( __ocitools_complete_seccomp_arches ) -- "$cur" ) ) + COMPREPLY=( $( compgen -W $( __oci-runtime-tool_complete_seccomp_arches ) -- "$cur" ) ) return ;; --arch) - COMPREPLY=( $( compgen -W $( __ocitools_complete_arches ) -- "$cur" ) ) + COMPREPLY=( $( compgen -W $( __oci-runtime-tool_complete_arches ) -- "$cur" ) ) return ;; --seccomp-default) - __ocitools_complete_seccomp_actions + __oci-runtime-tool_complete_seccomp_actions return ;; --root-propagation) - __ocitools_complete_propagations + __oci-runtime-tool_complete_propagations return ;; --cap-add|--cap-drop) - __ocitools_complete_capabilities + __oci-runtime-tool_complete_capabilities return ;; @@ -358,14 +358,14 @@ _ocitools_generate() { ;; --groups) - COMPREPLY=( $( compgen -W "$( __ocitools_groups )" -- "$cur" ) ) - __ocitools_nospace + COMPREPLY=( $( compgen -W "$( __oci-runtime-tool_groups )" -- "$cur" ) ) + __oci-runtime-tool_nospace return ;; --poststart|--poststop|--prestart) - COMPREPLY=( $( compgen -W "$( __ocitools_hooks )" -- "$cur" ) ) - __ocitools_nospace + COMPREPLY=( $( compgen -W "$( __oci-runtime-tool_hooks )" -- "$cur" ) ) + __oci-runtime-tool_nospace return ;; @@ -376,21 +376,21 @@ _ocitools_generate() { ;; '') COMPREPLY=( $( compgen -W '/' -- "$cur" ) ) - __ocitools_nospace + __oci-runtime-tool_nospace ;; *) _filedir - __ocitools_nospace + __oci-runtime-tool_nospace ;; esac return ;; --env|-e) COMPREPLY=( $( compgen -e -- "$cur" ) ) - __ocitools_nospace + __oci-runtime-tool_nospace return ;; - $(__ocitools_to_extglob "$options_with_args") ) + $(__oci-runtime-tool_to_extglob "$options_with_args") ) return ;; esac @@ -402,7 +402,7 @@ _ocitools_generate() { esac } -_ocitools() { +_oci-runtime-tool() { local previous_extglob_setting=$(shopt -p extglob) shopt -s extglob @@ -412,7 +412,7 @@ _ocitools() { ) # These options are valid as global options for all client commands - # and valid as command options for `ocitools daemon` + # and valid as command options for `oci-runtime-tool daemon` local global_boolean_options=" --help -h --version -v @@ -426,7 +426,7 @@ _ocitools() { local cur prev words cword _get_comp_words_by_ref -n : cur prev words cword - local command='ocitools' command_pos=0 subcommand_pos + local command='oci-runtime-tool' command_pos=0 subcommand_pos local counter=1 while [ $counter -lt $cword ]; do case "${words[$counter]}" in @@ -444,14 +444,14 @@ _ocitools() { (( counter++ )) done - local completions_func=_ocitools_${command} + local completions_func=_oci-runtime-tool_${command} declare -F $completions_func >/dev/null && $completions_func eval "$previous_extglob_setting" return 0 } -eval "$__ocitools_previous_extglob_setting" -unset __ocitools_previous_extglob_setting +eval "$__oci-runtime-tool_previous_extglob_setting" +unset __oci-runtime-tool_previous_extglob_setting -complete -F _ocitools ocitools +complete -F _oci-runtime-tool oci-runtime-tool diff --git a/contrib/README.md b/contrib/README.md index e582aeaf5..f258eee25 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -1,3 +1,3 @@ -# ocitools contrib +# runtime-tools contrib -The `contrib` directory contains various scripts, programs, and other helpful things which are not part of the core ocitools. +The `contrib` directory contains various scripts, programs, and other helpful things which are not part of the core runtime tools. diff --git a/man/ocitools-generate.1.md b/man/oci-runtime-tool-generate.1.md similarity index 90% rename from man/ocitools-generate.1.md rename to man/oci-runtime-tool-generate.1.md index 147123d70..205dbbe8a 100644 --- a/man/ocitools-generate.1.md +++ b/man/oci-runtime-tool-generate.1.md @@ -1,15 +1,15 @@ -% OCI(1) OCITOOLS User Manuals +% OCI(1) OCI-RUNTIME-TOOL User Manuals % OCI Community % APRIL 2016 # NAME -ocitools-generate - Generate a config.json for an OCI container +oci-runtime-tool-generate - Generate a config.json for an OCI container # SYNOPSIS -**ocitools generate** *[OPTIONS]* +**oci-runtime-tool generate** *[OPTIONS]* # DESCRIPTION -`ocitools generate` generates configuration JSON for an OCI bundle. +`oci-runtime-tool generate` generates configuration JSON for an OCI bundle. By default, it writes the JSON to stdout, but you can use **--output** to direct it to a file. OCI-compatible runtimes like runC expect to read the configuration from `config.json`. @@ -195,7 +195,7 @@ read the configuration from `config.json`. By default, OCI containers are “unprivileged” (=false) and cannot do some of the things a normal root process can do. - When the operator executes **ocitools generate --privileged**, OCI will enable access to all devices on the host as well as disable some of the confinement mechanisms like AppArmor, SELinux, and seccomp from blocking access to privileged processes. This gives the container processes nearly all the same access to the host as processes generating outside of a container on the host. + When the operator executes **oci-runtime-tool generate --privileged**, OCI will enable access to all devices on the host as well as disable some of the confinement mechanisms like AppArmor, SELinux, and seccomp from blocking access to privileged processes. This gives the container processes nearly all the same access to the host as processes generating outside of a container on the host. **--read-only**=true|false Mount the container's root filesystem as read only. @@ -253,7 +253,7 @@ read the configuration from `config.json`. **--tmpfs**=[] Create a tmpfs mount Mount a temporary filesystem (`tmpfs`) mount into a container, for example: - $ ocitools generate -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image + $ oci-runtime-tool generate -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image This command mounts a `tmpfs` at `/tmp` within the container. The supported mount options are the same as the Linux default `mount` flags. If you do not specify any options, the systems uses the following options: `rw,noexec,nosuid,nodev,size=65536k`. @@ -292,14 +292,14 @@ This protects the containers image from modification. Read only containers may still need to write temporary data. The best way to handle this is to mount tmpfs directories on /generate and /tmp. - # ocitools generate --read-only --tmpfs /generate --tmpfs /tmp --tmpfs /run --rootfs /var/lib/containers/fedora /bin/bash + # oci-runtime-tool generate --read-only --tmpfs /generate --tmpfs /tmp --tmpfs /run --rootfs /var/lib/containers/fedora /bin/bash ## Exposing log messages from the container to the host's log If you want messages that are logged in your container to show up in the host's syslog/journal then you should bind mount the /dev/log directory as follows. - # ocitools generate --bind /dev/log:/dev/log --rootfs /var/lib/containers/fedora /bin/bash + # oci-runtime-tool generate --bind /dev/log:/dev/log --rootfs /var/lib/containers/fedora /bin/bash From inside the container you can test this by sending a message to the log. @@ -319,13 +319,13 @@ To mount a host directory as a container volume, specify the absolute path to the directory and the absolute path for the container directory separated by a colon: - # ocitools generate --bind /var/db:/data1 --rootfs /var/lib/containers/fedora --args bash + # oci-runtime-tool generate --bind /var/db:/data1 --rootfs /var/lib/containers/fedora --args bash ## Using SELinux You can use SELinux to add security to the container. You must specify the process label to run the init process inside of the container using the --selinux-label. - # ocitools generate --bind /var/db:/data1 --selinux-label system_u:system_r:svirt_lxc_net_t:s0:c1,c2 --mount-label system_u:object_r:svirt_sandbox_file_t:s0:c1,c2 --rootfs /var/lib/containers/fedora --args bash + # oci-runtime-tool generate --bind /var/db:/data1 --selinux-label system_u:system_r:svirt_lxc_net_t:s0:c1,c2 --mount-label system_u:object_r:svirt_sandbox_file_t:s0:c1,c2 --rootfs /var/lib/containers/fedora --args bash Not in the above example we used a type of svirt_lxc_net_t and an MCS Label of s0:c1,c2. If you want to guarantee separation between containers, you need to make sure that each container gets launched with a different MCS Label pair. @@ -350,7 +350,7 @@ Now, writing to the /data1 volume in the container will be allowed and the changes will also be reflected on the host in /var/db. # SEE ALSO -**runc**(1), **ocitools**(1) +**runc**(1), **oci-runtime-tool**(1) # HISTORY April 2016, Originally compiled by Dan Walsh (dwalsh at redhat dot com) diff --git a/man/ocitools-validate.1.md b/man/oci-runtime-tool-validate.1.md similarity index 61% rename from man/ocitools-validate.1.md rename to man/oci-runtime-tool-validate.1.md index e5e3a1b8b..81b41ea53 100644 --- a/man/ocitools-validate.1.md +++ b/man/oci-runtime-tool-validate.1.md @@ -1,11 +1,11 @@ -% OCI(1) OCITOOLS User Manuals +% OCI(1) OCI-RUNTIME-TOOL User Manuals % OCI Community % APRIL 2016 # NAME -ocitools-validate - Validate an OCI bundle +oci-runtime-tool-validate - Validate an OCI runtime bundle # SYNOPSIS -**ocitools validate** *[OPTIONS]* +**oci-runtime-tool validate** *[OPTIONS]* # DESCRIPTION @@ -19,7 +19,7 @@ Validate an OCI bundle Path to bundle # SEE ALSO -**ocitools**(1) +**oci-runtime-tool**(1) # HISTORY April 2016, Originally compiled by Dan Walsh (dwalsh at redhat dot com) diff --git a/man/ocitools.1.md b/man/oci-runtime-tool.1.md similarity index 64% rename from man/ocitools.1.md rename to man/oci-runtime-tool.1.md index a698fff4e..b07f1fe9c 100644 --- a/man/ocitools.1.md +++ b/man/oci-runtime-tool.1.md @@ -1,16 +1,16 @@ -% OCI(1) OCITOOLS User Manuals +% OCI(1) OCI-RUNTIME-TOOL User Manuals % OCI Community % APRIL 2016 # NAME -ocitools \- OCI (Open Container Initiative) tools +oci-runtime-tool \- OCI (Open Container Initiative) runtime tools # SYNOPSIS -**ocitools** [OPTIONS] COMMAND [arg...] +**oci-runtime-tool** [OPTIONS] COMMAND [arg...] -**ocitools** [--help|-v|--version] +**oci-runtime-tool** [--help|-v|--version] # DESCRIPTION -ocitools is a collection of tools for working with the [OCI runtime specification](https://github.com/opencontainers/runtime-spec). +oci-runtime-tool is a collection of tools for working with the [OCI runtime specification](https://github.com/opencontainers/runtime-spec). # OPTIONS @@ -38,14 +38,14 @@ ocitools is a collection of tools for working with the [OCI runtime specificatio # COMMANDS **validate** Validating OCI bundle - See **ocitools-validate(1)** for full documentation on the **validate** command. + See **oci-runtime-tool-validate(1)** for full documentation on the **validate** command. **generate** Generating OCI runtime spec configuration files - See **ocitools-generate(1)** for full documentation on the **generate** command. + See **oci-runtime-tool-generate(1)** for full documentation on the **generate** command. # SEE ALSO -**ocitools-validate**(1), **ocitools-generate**(1) +**oci-runtime-tool-validate**(1), **oci-runtime-tool-generate**(1) # HISTORY April 2016, Originally compiled by Daniel Walsh (dwalsh at redhat dot com) diff --git a/test_runtime.sh b/test_runtime.sh index c4d0691f9..504e4c6c4 100755 --- a/test_runtime.sh +++ b/test_runtime.sh @@ -77,7 +77,7 @@ trap cleanup EXIT tar -xf rootfs.tar.gz -C ${TESTDIR} cp runtimetest ${TESTDIR} -ocitools generate --output "${TESTDIR}/config.json" "${TEST_ARGS[@]}" --rootfs '.' +oci-runtime-tool generate --output "${TESTDIR}/config.json" "${TEST_ARGS[@]}" --rootfs '.' TESTCMD="${RUNTIME} start $(uuidgen)" pushd $TESTDIR > /dev/null