1
0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-05 18:45:01 +01:00

98 Commits

Author SHA1 Message Date
Giuseppe Scrivano
df2c209c27 run: add option --runtime
it allows to select a different OCI runtime to use with atomic run.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1196
Approved by: rhatdan
2018-02-23 15:15:05 +00:00
Giuseppe Scrivano
6eebb86402 atomic, run: implement --set option
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1186
Approved by: baude
2018-02-19 16:03:47 +00:00
Giuseppe Scrivano
a242c42871 validate: add option --all
it will validate all the images in a storage.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1150
Approved by: rhatdan
2018-01-05 09:35:43 +00:00
Giuseppe Scrivano
9218fe0516 containers, update: add --all option
If specified, tries to update all the installed containers.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1136
Approved by: baude
2018-01-04 15:46:33 +00:00
Giuseppe Scrivano
a7a67c9d57 images, update: add --all option
If specified, pull the latest version for all the images in a
storage.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1136
Approved by: baude
2018-01-04 15:46:33 +00:00
Giuseppe Scrivano
e78ecdd216 install: add new option --runtime=PATH to choose the OCI runtime
it is supported by system and user containers.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1125
Approved by: TomSweeneyRedHat
2017-11-14 10:27:00 +00:00
Giuseppe Scrivano
24e1a61e99 pull: support src-creds option
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1120
Approved by: ashcrow
2017-10-26 16:49:44 +00:00
baude
9a5497f93d Atomic/scan.py: Add ability to remediate
In the case of some scanners, they generate a script to remediate the
images|containers they have scanned.  We needed to provide a hook
for this ability. We now read the scanner's configuration file looking
for a "remediation_script" key, whose value should be a fq path to the
remediation script.  The remediation script should be delivered via
the scanning image via atomic install.

As of now, we pass the id of the scanned object and its results directory
as named arguments to the remediation script.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1090
Approved by: baude
2017-09-22 15:53:57 +00:00
Matthew Barnes
898e762c4c Remove commissaire integration
Commissaire project has halted development.  Remove the integration
points so as not to accumulate cruft in the "atomic" subcommands.

Closes: #1046
Approved by: rhatdan
2017-07-24 12:00:09 +00:00
Jan Černý
0d04058ebf Add configuration compliance scan to "atomic scan"
This commit enables scanning images and containers
for configuration compliance with security profiles
provided by SCAP Security Guide.
Note: This feature requires latest OpenSCAP Daemon from upstream
installed in the underlying "rhel7/openscap" container.

Closes: #1027
Approved by: baude
2017-06-15 18:18:31 +00:00
Brent Baude
2dfeae1356 Atomic/backends/_docker.py: Error prevention with atomic run
There were two primary cases where a secondary atomic run with a command
would trigger an exception.  The first was reported in
https://github.com/projectatomic/atomic/issues/1006. Basically it can
be summarized as:

```
atomic run registry.fedoraproject.org/fedora:25 date  # works fine
atomic run registry.fedoraproject.org/fedora:26 date  # tries to run in the existing f25 container
```

The second case is as simple as:

```
atomic run registry.fedoraproject.org/fedora:25 date  # works fine
atomic run registry.fedoraproject.org/fedora:25 date  # fails
```

This fails because atomic starts the stopped f25 container and then attempts a docker exec.  The
exec fails because the 'date' command is short-lived and the container exits prior to the exec
being run.

We now catch those exceptions and notify the user.  We added a `--replace` option to run where
atomic will now delete the container in question and re-run it from the correct image.

Closes: #1019
Approved by: baude
2017-05-31 19:20:25 +00:00
Brent Baude
9525bfefa0 Allow anonymous push
Added an --anonymous switch to the push command to allow users
to push anonymously without having to be prompted for a username
and password.

Closes: #964
Approved by: rhatdan
2017-04-13 16:13:07 +00:00
Brent Baude
2b744bfdbb Honor proxy usage
If HTTP[S]_PROXY is defined, honor it in python requests usage
as well as pass it on to skopeo.

If http[s]_proxy is defined in atomic.conf, use it; however, environment
variables will override these if defined.

Added --insecure to Atomic push so the user can override the logic
(or lack thereof) around deducing if a registry is insecure.  Also
needed for integration tests.

Closes: #964
Approved by: rhatdan
2017-04-13 16:13:07 +00:00
Giuseppe Scrivano
cb2b7d2ce2 bash: add autocompletion for images tag
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #958
Approved by: rhatdan
2017-04-12 21:33:58 +00:00
Brent Baude
1b216a4919 Atomic/install.py: Record installs for later use
When installing an image, we now write a small bit of json
to /var/lib/atomic/install.json.  The json format is:

{
	<image_name>: {
			     id: <image_id>,
			     install_date: <install_date_in_utc
			 }
}

This will be used in update, run, etc to ensure that any image
with an INSTALL label is first installed.

Closes: #950
Approved by: giuseppe
2017-03-28 19:10:57 +00:00
Giuseppe Scrivano
5f3a498138 install: add --system-package
Drop the hidden option ---generate-rpm in favor of --system-package.

The new option controls how a system container is installed to the host:

--generate-rpm=build build the rpm file without installing it.
--generate-rpm=yes build the rpm and install it, the rpm is deleted.
--generate-rpm=no do not attempt to build and install an rpm file.
--generate-rpm=auto install the rpm only if a .spec file is defined in
  the image.  This is the default.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #767
Approved by: rhatdan
2017-03-22 13:27:53 +00:00
Yu Qi Zhang
ba34cc0275 Fix filtering
Change the format of "Created" for images to match containers,
fix filtering for partial keywords, and update auto-complete
and man pages.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #923
Approved by: giuseppe
2017-03-10 18:02:57 +00:00
Yu Qi Zhang
4411d09ff8 Small fix to image info
Use default storage if user does not specify, so it doesn't output
"Unable to associate string 'None' with backend".

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #933
Approved by: baude
2017-03-07 21:25:08 +00:00
Shishir Mahajan
5a0138b1bf Add overlay2 as a valid option in atomic storage modify autocomplete.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>

Closes: #914
Approved by: rhatdan
2017-02-27 12:37:13 +00:00
Shishir Mahajan
ab4e7cb0bb add --lvsize option to atomic storage modify
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>

Closes: #900
Approved by: rhatdan
2017-02-21 17:03:28 +00:00
Brent Baude
ed9eaf2e55 Fix Stop Regression: BZ #1422448
BZ #1422448 actually points out one regression and one
bug related to atomic stop. The BZ itself points out
a TypeError exception in the code when trying to glue
together a python list and str.

Then the atomic stop command was failling in the case where a
STOP label was defined and it uses the variable $NAME resulting
in a subprocess exception.

The self.name variable was not being set by set_args after
refactoring occured.  Ideally, this should all be moved
into the image|container object handling but for now we
just handle it in set_args.

Also added a test in test_display to catch any future
regressions.

Closes: #899
Approved by: rhatdan
2017-02-20 20:37:38 +00:00
Brent Baude
5cd25b9076 Refactor uninstall and add options
Refactor the uninstall class to use the backends, container and image
objects.

Add --display so one can run atomic uninstall --display <image>
and see what the outcome would be. This will be helpful in integration
testing and was discussed in BZ https://bugzilla.redhat.com/show_bug.cgi?id=1248038.

Add --storage option so users can dictate priority when uninstalling
an image.  This also mimics the newest install class as well.

Closes: #888
Approved by: giuseppe
2017-02-15 09:50:55 +00:00
Giuseppe Scrivano
15db71aec7 update: support update to a different image via --rebase
It allows to override the image to use for the update.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #883
Approved by: rhatdan
2017-02-12 16:17:12 +00:00
Shishir Mahajan
e17475d50f Add --rootfs and --lvname options to atomic storage modify.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>

Closes: #872
Approved by: rhatdan
2017-02-10 20:45:44 +00:00
Aaron Weitekamp
ddc72a61e8 Inline pubkeys in policy.json
Closes: #853
Approved by: rhatdan
2017-02-06 22:41:40 +00:00
Brent Baude
02bd134f1c Add --storage to install|run
To have parity function with pull, we need to add --storage
to install and run.  This allows for overriding when atomic.type
is defined.  For example, if you pull an image that has
atomic.type=system but you really want to store it
on the docker backend.

Closes: #861
Approved by: baude
2017-02-04 17:05:24 +00:00
Brent Baude
f79d56bd13 Disconnect backends
Ideally, the atomic CLI should be able to operate independently
of the backends it supports.  For example, if dockerd is inactive,
the ostree backend and atomic cli should still work.

This requires some tweaking to the backendutils code and the work
flow.  We also need to specifically know if the user passes
--storage so that we treat that as an explicit override.  The work
flow is now roughly:

* a default storage can be defined in atomic.conf (was always this way)
* if not defined, defaults to docker.
* if --storage is passed, treat explictly and fail if cannot execute
* if no --storage is specified, use default.  if default is not available, move
 onto the next backend.
2017-01-25 19:07:20 -06:00
Aaron Weitekamp
650c961425 add trust reset command
Signed-off-by: Aaron Weitekamp <aweiteka@redhat.com>

Closes: #824
Approved by: rhatdan
2017-01-18 15:22:53 +00:00
Dan Walsh
e7607c0790 Add keywords to completions
Closes: #800
Approved by: rhatdan
2016-12-14 13:12:59 +00:00
yuqi-zhang
5cea34fc4a update: refactor into non-base verbs
Refactor:
  `atomic update`
  `atomic update --container`
  `atomic update --container --rollback`

To:
  `atomic images update`
  `atomic containers update`
  `atomic containers rollback`

And update corresponding tests, docs and auto-complete. Much like
other image commands (info, verify), the base verb is hidden but
still available for use.

Move update functionality from atomic.py to update.py, and use
new backendutils to abstract.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #773
Approved by: rhatdan
2016-12-12 21:56:55 +00:00
Dan Walsh
d6bdd78c8d Atomic storage reset does not work on docker-latest
This patch will allow user to specify the graphdriver on atomic reset

If /var/lib/docker or /var/lib/docker-latest is the only thing installed
it will reset the correct path.  If both exists or the user as chosen
a different location, the --graph option must be specified.

Closes: #745
Approved by: rhatdan
2016-12-12 19:17:19 +00:00
Brent Baude
1db4288aa9 Atomic/diff.py: Use go-mtree for file comparisons
The previous algorithm for comparing files used python's
dircmp and is considered to be a shallow comparision.  This
allowed distinctly small possibilities that two files being
compared could be different but not caught.

We now use go-mtree to do the comparison.  This can emulate the
shallow comparison we had before but we can also adding a
sha256digest as part of the comparison using the new --keywords
option.

Also, made slight tweaks to gomtree functions in Atomic.util
so we debug and influence the return of JSON data.

This solves https://github.com/projectatomic/atomic/issues/761

Closes: #777
Approved by: rhatdan
2016-12-05 15:08:01 +00:00
Brent Baude
ef984ed066 Refactor images
Covers all but verify and generate.  This is a refactoring of the
images subverbs (i.e. info, version, delete, ...)

Added in a unittest for list and info.

Closes: #771
Approved by: baude
2016-11-29 21:47:05 +00:00
yuqi-zhang
148be22083 syscontainers: add rollback
Add --rollback flag to atomic update, which switches a system
container to the other deployment if one exists.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #762
Approved by: rhatdan
2016-11-22 19:17:17 +00:00
Brent Baude
552e3f3bcb atomic diff: Add ability to compare metadata
With the -m switch, we can now compare the metadata between
the two diff objects.  We report only the differences between them. All
common data is deleted from the object structures.

This solves --> https://github.com/projectatomic/atomic/issues/760

Closes: #764
Approved by: baude
2016-11-18 21:22:51 +00:00
Giuseppe Scrivano
3190da65f8 bash: do not print error if checkout dir doesn't exist
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1387860

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #722
Approved by: rhatdan
2016-10-24 13:13:08 +00:00
yuqi-zhang
fb3779349e Add --storage option to image-related commands
Add an optional --storage flag to the following commands:
 - images delete
 - info
 - mount
 - verify
 - version

If specified, the command will only look at the specified storage
(ostree/docker) for the image to perform the action. If not
specified, the command will look through both ostree/docker for
the image (as it was before). However, if the storage is not
specified and the image exists in both ostree and docker, the
command will error and prompt the user to specify. Image inspection
also no longer forces the user to delete/rename one or the other.

This is meant to address the duplicate naming issue (where a user
can have an image in both ostree and docker with the same name).

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #720
Approved by: giuseppe
2016-10-24 09:27:00 +00:00
Aaron Weitekamp
6d909022fc trust show GPG key ID
Closes: #702
Approved by: rhatdan
2016-10-13 20:59:03 +00:00
Aaron Weitekamp
8d23c2bffa remove sigstore config with trust delete 2016-10-13 13:34:20 -04:00
Dan Walsh
3b486957de Remove primary commands and move to images subcommand
In order to cleanup code and simplify interface, i
move help, info, verify and version to the images subcommand.

Remove man pages for these atomic commands and add info to images subcommand.

Since these have been previously documented we will continue to support
atomic help
atomic info
atomic verify
atomic version

But we will not document them.

Closes: #676
Approved by: rhatdan
2016-10-08 09:46:56 +00:00
yuqi-zhang
20cc5ecfdd images: fix system images auto-complete
Image names are stored differently in ostree, and thus cannot be
directly used as we used to.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #681
Approved by: rhatdan
2016-10-06 10:11:37 +00:00
yuqi-zhang
075035a052 version: save and display system image info
Save labels from docker manifest into ostree, so when a user invokes
'atomic version' on a system image, the metadata info is displayed,
same as docker images.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #679
Approved by: giuseppe
2016-10-05 12:36:57 +00:00
Dan Walsh
1609f8d3af Code cleanup for atomic sign
We need to default the gnukeyring to the users login directory. To
make it easier for the user.

Also add bash completions for -g option

Closes: #671
Approved by: rhatdan
2016-10-04 14:44:12 +00:00
yuqi-zhang
3e55ad6621 Start/stop syscontainers with atomic run/stop
Wrap atomic run/stop with systemctl start/stop for system
containers. This way the user can directly use the atomic
CLI for the full container cycle. In addition, the equivalent
functionality already exists for docker containers, so it
makes sense to allow system containers to start/stop in a
similar fashion.

Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

Closes: #651
Approved by: rhatdan
2016-09-21 20:56:13 +00:00
Dan Walsh
f439d70f7a Add additional bash completions for push/pull
Closes: #635
Approved by: rhatdan
2016-09-20 09:20:59 +00:00
Aaron Weitekamp
0870507325 add atomic trust show
Closes: #629
Approved by: rhatdan
2016-09-20 08:48:20 +00:00
Dan Walsh
9350770c33 Fix up atomic trust completions
Closes: #627
Approved by: rhatdan
2016-09-18 11:40:43 +00:00
Aaron Weitekamp
60e073d80e add default policy trust arg
Closes: #604
Approved by: baude
2016-09-15 14:24:49 +00:00
Aaron Weitekamp
41884aa683 add bash completions
Closes: #604
Approved by: baude
2016-09-15 14:24:49 +00:00
Dan Walsh
48c1d2519c Add support for deleting containers
We want to be able to delete containers from the system, using the
new atomic containers delete call.

atomic containers delete --all

Comes in handy.

Closes: #598
Approved by: giuseppe
2016-09-08 20:29:15 +00:00