Commit Graph

12 Commits

Author SHA1 Message Date
Adam Miller
314ac5721d fix the docker_label entry to be a valid JSON string
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-07-07 18:17:25 -05:00
Adam Miller
a7a3eebfcc Fix docker_label keyword and fix label caps
Previously the key 'docker_labels' was used but this isn't actually
picked up by imagefactory because the parameter key it's looking for
is 'docker_label'. This patch resolves that.

Also included in this patch is a change to set the labels to be
lowercase as defined in the Fedora Container Guidelines.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-06-29 11:41:31 -05:00
Adam Miller
811e1ec85e Switch from docker to container namespace
Fedora Atomic WG has decided to move from the "docker" namespace to
the "container" namespace for the sake of making it more generic in
order to target all OCI Compliant container runtimes instead of
a specific implementation. This update changes what is necessary for
to the base image metadata.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-04-26 22:55:41 -05:00
Adam Miller
b79963bcd4 Fix docker metadata formatting and license
The previous formatting for docker image metadata was getting
escaped incorrectly when passed to imagefactory. This resolves that.

Fix the license label to be MIT instead of GPLv2.

Fix the bash path

Remove atomic RUN command, it causes build failures and isn't
necessary in the base image.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-03-31 13:55:08 -05:00
Adam Miller
4172585460 Add dockerversion to factory-parameters
Currently, imagefactory's docker plugin will default an older
version of the metadata imager format that is not compatible with
the latest versions of docker. This change tells the plugin to use
the docker version "1.10.1" metadata format which is compatible with
all currently available docker releases.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-03-30 11:51:25 -05:00
Adam Miller
9726b84509 Add docker base image metadata
Currently we don't produce a docker base image that can be used with
OSBS or via the 'atomic run' command without modification. This
fixes that and will allow for an automated import of the base images
into the Fedora Container Registry

Also fix some missing commas in list and dict declarations

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-03-28 16:54:48 -05:00
Dennis Gilmore
62ad8d41a7 rename the Fedora_Docker compose to Fedora-Docker
PDC only allows a-Z and - in the compose names

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-11 14:39:32 -06:00
Dennis Gilmore
198d7c4208 change the docker base image file name back to make koji happy
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 17:03:42 -06:00
Dennis Gilmore
14d47ef9bb change Fedora-Docker to Fedora_Docker
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 12:15:44 -06:00
Dennis Gilmore
97a1744c4b fix up repos
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 11:50:02 -06:00
Dennis Gilmore
0daa664b40 add install tre from
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 11:32:10 -06:00
Dennis Gilmore
e1b602d79c add docker base image compose
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 10:39:31 -06:00