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

14 Commits

Author SHA1 Message Date
Alex Jia
ae782515a0 atomic.conf: fix syntax error of the YAML format
We use YAML format in atomic.conf file, so it should be KEY: VALUE
not KEY=VALUE.

Signed-off-by: Alex Jia <ajia@redhat.com>

Closes: #1004
Approved by: baude
2017-05-31 18:04:30 +00:00
Steve Milner
2760e30296 Atomic/util.py: Add no_proxy
http_proxy and https_proxy are currently supported in /etc/atomic.conf.
This change adds no_proxy support. no_proxy is for urls which should
not go through a proxy.

Closes: #999
Approved by: baude
2017-05-13 00:47:55 +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
Aaron Weitekamp
ddc72a61e8 Inline pubkeys in policy.json
Closes: #853
Approved by: rhatdan
2017-02-06 22:41:40 +00:00
Aaron Weitekamp
c00a1972df add keyring override config
Closes: #643
Approved by: rhatdan
2016-09-26 14:31:13 +00:00
Brent Baude
f60218a679 Atomic/pull.py: Set docker as default backend
Setting docker as the default backend instead of ostree.

Closes: #637
Approved by: rhatdan
2016-09-20 16:07:32 +00:00
Aaron Weitekamp
aa9db7bd13 signing bootstrap workflow
Closes: #599
Approved by: rhatdan
2016-09-19 13:33:16 +00:00
Brent Baude
d89b47d4f4 Atomic/sign.py|util.py Support sigstore from conf files
We now derive the proper sigstore from a series of YAML
configuration files in /etc/containers/registries.d.  These
configuration files can have: sigstore and sigstore-write as
keys and the values are a file path or http|s URL.

When signing an image, as long as the -d override is not used,
we use those values when writing local signatures.

Closes: #603
Approved by: rhatdan
2016-09-10 09:45:16 +00:00
Brent Baude
5190152d88 Change rules around declaring a default scanner.
Previously, with the understanding we would be shipping a single
generic scanner configuration file, would 1) install the config
file and we had preset a default scanner in atomic.conf.

With the realization that the scanner could be variable based
on the distribution, the generic file is not longer installed
by default. Therefore, we should probably not set a default.

The prior code failed if a default was not defined in
/etc/atomic.conf.  That code check has been altered and we now
adhere to the following rules:

* If no default is defined AND there is only one configured
 scanner, we assume the single scanner IS the default.

* If no default is defined AND there are multiple scanners, we
 error out and ask the user to define one.

* If there is a default defined, good to go!

Closes: #383
Approved by: rhatdan
2016-05-25 14:31:56 +00:00
Giuseppe Scrivano
b7a56d9b51 atomic.conf: Add option to configure the checkout path
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2016-04-18 20:27:32 +02:00
Giuseppe Scrivano
3dd531fcdc atomic.conf: Add option to configure the OSTree repository
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2016-04-18 20:27:32 +02:00
Giuseppe Scrivano
025701e9ee atomic.conf: add option for default storage
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2016-04-18 20:27:32 +02:00
Dan Walsh
ddc8dd68f0 Allow user to specify alternative docker executables.
This will allow us to support docker-latest
2016-04-13 08:53:19 -04:00
Brent Baude
6ed4994b0d Implement generic scanning in Atomic
As more scanners besides openscap become available, atomic
can now begin to leverage them.  The new scan function has
been broken out into its on file (scan.py).

The scan command itself now defaults to openscap but can
also be switched to blackduck with --scanner.

Atomic now can use a configuration file which is stored
in /etc/atomic.conf.  The location of the atomic conf
file can be overriden with the environment variable
'ATOMIC_CONF'.  In the case of the scan function,
we need the scanner defined in the configuration file
as well as the fully qualified image name and the
scan arguments.  Optionally, you can provide additional
custom docker arguments for the scanner as well
2016-04-07 09:33:00 -05:00