standardizing on container vs jail

This commit is contained in:
Christer Edwards
2019-11-20 19:16:21 -07:00
parent 7e2b03b73b
commit e68bd1b3ae
18 changed files with 61 additions and 57 deletions

View File

@@ -2,7 +2,7 @@
cmd
===
To execute commands within the jail you can use `bastille cmd`.
To execute commands within the container you can use `bastille cmd`.
.. code-block:: shell

View File

@@ -1,7 +1,7 @@
console
=======
This sub-command launches a login shell into the jail. Default is password-less
This sub-command launches a login shell into the container. Default is password-less
root login.
.. code-block:: shell
@@ -31,6 +31,6 @@ root login.
Edit /etc/motd to change this login announcement.
root@folsom:~ #
At this point you are logged in to the jail and have full shell access. The
At this point you are logged in to the container and have full shell access. The
system is yours to use and/or abuse as you like. Any changes made inside the
jail are limited to the jail.
container are limited to the container.

View File

@@ -1,7 +1,7 @@
cp
==
This command allows efficiently copying files from host to jail(s).
This command allows efficiently copying files from host to container(s).
.. code-block:: shell

View File

@@ -2,7 +2,7 @@ create
======
Bastille create uses any available bootstrapped release to create a
lightweight jailed system. To create a jail simply provide a name,
lightweight container system. To create a container simply provide a name,
bootstrapped release and a private (rfc1918) IP address.
- name
@@ -18,10 +18,10 @@ bootstrapped release and a private (rfc1918) IP address.
NAME: folsom.
IP: 10.17.89.10.
This command will create a 11.3-RELEASE jail assigning the 10.17.89.10 ip
This command will create a 11.3-RELEASE container assigning the 10.17.89.10 ip
address to the new system.
I recommend using private (rfc1918) ip address ranges for your jails. These
I recommend using private (rfc1918) ip address ranges for your container. These
ranges include:
- 10.0.0.0/8

View File

@@ -1,8 +1,8 @@
destroy
=======
Jails can be destroyed and thrown away just as easily as they were
created. Note: jails must be stopped before destroyed.
Containers can be destroyed and thrown away just as easily as they were
created. Note: containers must be stopped before destroyed.
.. code-block:: shell
@@ -13,6 +13,6 @@ created. Note: jails must be stopped before destroyed.
.. code-block:: shell
ishmael ~ # bastille destroy folsom
Deleting Jail: folsom.
Note: jail console logs not destroyed.
Deleting Container: folsom.
Note: containers console logs not destroyed.
/usr/local/bastille/logs/folsom_console.log

View File

@@ -2,10 +2,10 @@
htop
====
This one runs `htop` inside the jail.
note: won't work if you don't have htop installed in the jail.
This one runs `htop` inside the container.
note: won't work if you don't have htop installed in the container.
.. image:: ../../images/htop.png
:align: center
:alt: bastille htop jail
:alt: bastille htop container

View File

@@ -2,7 +2,7 @@
pkg
===
To manage binary packages within the jail use `bastille pkg`.
To manage binary packages within the container use `bastille pkg`.
.. code-block:: shell

View File

@@ -1,7 +1,7 @@
restart
=======
To restart a jail you can use the `bastille restart` command.
To restart a container you can use the `bastille restart` command.
.. code-block:: shell

View File

@@ -1,7 +1,7 @@
start
=====
To start a jail you can use the `bastille start` command.
To start a container you can use the `bastille start` command.
.. code-block:: shell

View File

@@ -1,7 +1,7 @@
stop
====
To stop a jail you can use the `bastille stop` command.
To stop a container you can use the `bastille stop` command.
.. code-block:: shell

View File

@@ -3,7 +3,7 @@ sysrc
=====
The `sysrc` sub-command allows for safely editing system configuration files.
In jail terms, this allows us to toggle on/off services and options at startup.
In container terms, this allows us to toggle on/off services and options at startup.
.. code-block:: shell

View File

@@ -2,9 +2,9 @@
top
===
This one runs `top` in that jail.
This one runs `top` in that container.
.. image:: ../../images/top.png
:align: center
:alt: bastille top jail
:alt: bastille top container

View File

@@ -2,8 +2,8 @@
update
======
The `update` command targets a release instead of a jail. Because every jail is
based on a release, when the release is updated all the jails are automatically
The `update` command targets a release instead of a container. Because every container is
based on a release, when the release is updated all the containers are automatically
updated as well.
If no updates are available, a message will be shown:
@@ -38,4 +38,4 @@ The older the release, however, the more updates will be available:
The following files will be added as part of updating to 10.4-RELEASE-p13:
...[snip]...
To be safe, you may want to restart any jails that have been updated live.
To be safe, you may want to restart any containers that have been updated live.