Commit Graph

10 Commits

Author SHA1 Message Date
Adam Miller
2a565c78bc rebase and fix unicode issue
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-08-15 13:32:25 -05:00
Dusty Mabe
6a85929943
container: add global vars for image-build tasks
composes were failing because the 2nd image build task
for the minimal image (copied from fedora.conf) didn't
have some variables defined. In fedora.conf the global_*
vars are defined, so let's do that here too.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-08-15 11:59:17 -04:00
Dusty Mabe
c416952658
container: pull from linked repo
We don't create a repo during this pungi run. We need to pull
from a repo that was already created.

This was a copy/paste error from f6e7f69.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-08-15 10:28:49 -04:00
Dusty Mabe
f6e7f6901b
updates to fedora-docker.conf
- Update disk_size to 5 from 3 (from 30e6896)
- Add in Container minimal image build
- Fix references to f25 -> f26
- Fix references to f27 -> f26

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-08-14 17:41:12 -04:00
Adam Miller
ae2f611637 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 as well as add a transitional second call
to handle both the docker and container namespace for block_retired.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-04-26 17:16:16 -05:00
Dennis Gilmore
61bf74d401 subsitute Atomic in the iso volume id
As there is a hard limit for volume id's on isos to be <32 characters,
we have a list of subsitutions that we maintain to make sure that
isos all have volume id's under that size. with the addition of
ppc64le and aarch64 for Atomic host installer the 7 character arch
length pushed us over the limit using AH for Atomic seems the most
logical change to make.

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-04-18 10:07:51 -05:00
Adam Miller
a522a05f95 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:58:16 -05:00
Adam Miller
8c67ff4042 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 12:11:07 -05:00
Adam Miller
eaedf7da3b 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 various missing commas in dict declarations

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-03-28 17:11:19 -05:00
Mohan Boddu
fd9eb1219d Adding cloud, atomic and docker composes
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-02-24 13:28:32 -05:00