Merge pull request #579 from bsdlme/master

Sort bastille usage ouput and update README.md for newer FreeBSD releases

README.md

@@ -39,39 +39,41 @@ Bastille is an open-source system for automating deployment and management of
 containerized applications on FreeBSD.
 
 Usage:
-  bastille command TARGET args
+  bastille command TARGET [args]
 
 Available Commands:
   bootstrap   Bootstrap a FreeBSD release for container base.
   clone       Clone an existing container.
   cmd         Execute arbitrary command on targeted container(s).
   config      Get or set a config value for the targeted container(s).
   console     Console into a running container.
-  convert     Convert a thin container into a thick container.
+  convert     Convert a Thin container into a Thick container.
   cp          cp(1) files from host to targeted container(s).
-  create      Create a new thin or thick container.
-  destroy     Destroy a stopped container or a bootstrapped release.
+  create      Create a new thin container or a thick container if -T|--thick option specified.
+  destroy     Destroy a stopped container or a FreeBSD release.
   edit        Edit container configuration files (advanced).
-  export      Exports a container archive or image.
-  help        Help about any command
+  export      Exports a specified container.
+  help        Help about any command.
   htop        Interactive process viewer (requires htop).
-  import      Import a container archive or image.
+  import      Import a specified container.
   limits      Apply resources limits to targeted container(s). See rctl(8).
-  list        List containers, releases, templates, logs, limits or backups.
+  list        List containers (running and stopped).
   mount       Mount a volume inside the targeted container(s).
   pkg         Manipulate binary packages within targeted container(s). See pkg(8).
   rdr         Redirect host port to container port.
+  rename      Rename a container.
   restart     Restart a running container.
   service     Manage services within targeted container(s).
   start       Start a stopped container.
   stop        Stop a running container.
   sysrc       Safely edit rc files within targeted container(s).
-  template    Apply automation templates to targeted container(s).
+  tags        Add or remove tags to targeted container(s).
+  template    Apply file templates to targeted container(s).
   top         Display and update information about the top(1) cpu processes.
   umount      Unmount a volume from within the targeted container(s).
   update      Update container base -pX release.
   upgrade     Upgrade container release to X.Y-RELEASE.
-  verify      Verify bootstrapped release or automation template.
+  verify      Compare release against a "known good" index.
   zfs         Manage (get|set) ZFS attributes on targeted container(s).
 
 Use "bastille -v|--version" for version information.
@@ -236,23 +238,23 @@ not using ZFS and can safely ignore these settings.
 bastille bootstrap
 ------------------
 Before you can begin creating containers, Bastille needs to "bootstrap" a
-release.  Current supported releases are 11.4-RELEASE, 12.2-RELEASE and
-13.0-RELEASE.
+release.  Current supported releases are 12.3-RELEASE, 12.4-RELEASE and
+13.1-RELEASE.
 
 **Important: If you need ZFS support see the above section BEFORE
 bootstrapping.**
 
 To `bootstrap` a release, run the bootstrap sub-command with the
 release version as the argument.
 
-**FreeBSD 11.4-RELEASE**
+**FreeBSD 12.4-RELEASE**
 ```shell
-ishmael ~ # bastille bootstrap 11.4-RELEASE
+ishmael ~ # bastille bootstrap 12.4-RELEASE
 ```
 
-**FreeBSD 12.2-RELEASE**
+**FreeBSD 13.1-RELEASE**
 ```shell
-ishmael ~ # bastille bootstrap 12.2-RELEASE
+ishmael ~ # bastille bootstrap 13.1-RELEASE
 ```
 
 **HardenedBSD 11-STABLE-BUILD-XX**
@@ -380,7 +382,7 @@ Valid: (em0).
 NAME: vnettest0.
 IP: 192.168.87.55/24.
 INTERFACE: em0.
-RELEASE: 12.1-RELEASE.
+RELEASE: 12.2-RELEASE.
 
 syslogd_flags: -s -> -ss
 sendmail_enable: NO -> NONE

usr/local/bin/bastille

@@ -74,8 +74,8 @@ Usage:
 
 Available Commands:
   bootstrap   Bootstrap a FreeBSD release for container base.
-  cmd         Execute arbitrary command on targeted container(s).
   clone       Clone an existing container.
+  cmd         Execute arbitrary command on targeted container(s).
   config      Get or set a config value for the targeted container(s).
   console     Console into a running container.
   convert     Convert a Thin container into a Thick container.
@@ -98,8 +98,8 @@ Available Commands:
   start       Start a stopped container.
   stop        Stop a running container.
   sysrc       Safely edit rc files within targeted container(s).
-  template    Apply file templates to targeted container(s).
   tags        Add or remove tags to targeted container(s).
+  template    Apply file templates to targeted container(s).
   top         Display and update information about the top(1) cpu processes.
   umount      Unmount a volume from within the targeted container(s).
   update      Update container base -pX release.