Commit Graph

139 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
Dusty Mabe
d9f808536d
atomic: use kojipkgs url everywhere
We need to use the kojipkgs url on the builders because they don't
have access to dl.fp.o. After some discussion we have just decided
to use the kojipkgs url everywhere as the dl.fp.o url is just a
redirect anyway.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-02-09 15:04:30 -05:00
Patrick Uiterwijk
f28479362c Update Fedora 25 ref names
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2017-02-07 17:43:45 +00:00
Patrick Uiterwijk
5ddf7e3157 Use compose-koji
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2016-12-14 13:40:50 +00:00
Dennis Gilmore
8ab434347d pungi 4.1.10 does not need to be told to keep comps for a variaant, it does it if there is noting filter
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-10-09 17:15:04 -05:00
Mohan Boddu
083caaf2b2 Fix for ostree_osname for workstation ostree
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-10-05 09:45:32 -05:00
Dennis Gilmore
241bf23cba fixups for workstation ostree install dvd
use fedora-productimg-workstation not the atomic one
make sure the ref to install is correct

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-10-05 09:03:04 -05:00
Lubomír Sedlář
5847e51160 Update configuration for pungi 4.1.9
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-09-22 14:38:34 +02:00
Dennis Gilmore
717ae98d50 do not allow unsigned rpms and fix up the keys
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-08-16 15:07:31 -05:00
Peter Robinson
baf76c62a5 use f25 branch for the global_ksurl
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2016-08-15 19:53:42 +01:00
Lubomír Sedlář
56551eeb9d Fix a typo
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-15 18:55:52 +02:00
Dennis Gilmore
716f612efd fix up failable deliverables, get the right git branches
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-08-15 10:21:05 -05:00
Dennis Gilmore
88fa4e95b2 allow cloud images to be failable. this will need changed soon
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-08-15 10:12:12 -05:00
Dennis Gilmore
e54ca26e86 fix up whitespace in ostree
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-08-15 10:10:26 -05:00
Peter Robinson
c3aa1ccdc9 fix up some Rawhide -> 25 misses
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2016-07-27 11:01:25 +01:00
Peter Robinson
2330bf3df3 setup for F-25 branching
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2016-07-26 07:40:45 +01:00
Peter Robinson
be2e013270 OZ supports new Fedora releases. There's no real change between 20 and 22
except that non x86 needs at least version 22. We've been using this
version without issue for some time on non x86 composees. Bring rawhide
up to this so we're the same.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2016-07-26 04:44:49 +01:00
Dennis Gilmore
2d459bec29 point workstation ostree instakller at the correct git repo and files
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-27 11:50:36 -05:00
Dennis Gilmore
3d1422b98b Revert "disable workstation ostree installer for now"
This reverts commit 11335c0109.
2016-05-27 11:48:49 -05:00
Dennis Gilmore
a3d48b1b61 point ostree installer at the updated location for lorax templates
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-27 11:48:10 -05:00
Dennis Gilmore
7ed7fa6105 attempt to add the correct ova-option to set the vagrant_sync_directory
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-27 11:47:12 -05:00
Lubomír Sedlář
b3fb6f9911 It's ostree-installer, not ostree_installer
in the definition of failable deliverables.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-27 12:22:57 +02:00
Dennis Gilmore
da73478e8d multilib apitrace-libs and fakeroot-libs
https://pagure.io/pungi-fedora/issue/21

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-24 07:25:39 -05:00
Dennis Gilmore
e30433d167 Revert "point back to fedorahosted for kickstarts"
This reverts commit 04b74bfcad.
2016-05-16 21:17:23 -05:00
Dennis Gilmore
11335c0109 disable workstation ostree installer for now
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-16 15:57:28 -05:00
Dennis Gilmore
c25ce32fee remove extra ) in ostree config
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-16 07:51:40 -05:00
Dennis Gilmore
4501e86474 config tweak for second ostree jobs
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-15 21:59:15 -05:00
Dennis Gilmore
2d10497163 attempt to make a workstation ostree
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-14 20:49:05 -05:00
Dennis Gilmore
04b74bfcad point back to fedorahosted for kickstarts
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-05-14 20:43:42 -05:00
Kevin Fenzi
e249ad33f1 Handle move of comps and spin-kickstarts to pagure
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2016-05-13 16:32:43 -06:00
Lubomír Sedlář
21024d15e0 Reduce duplication in configuration
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-02 09:59:38 +02:00
Dennis Gilmore
600dbda3aa Revert "add ostree workstation to rawhide"
This reverts commit a285c9d37a.
2016-04-20 11:35:51 -05:00
Dennis Gilmore
a285c9d37a add ostree workstation to rawhide
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-20 11:18:37 -05:00
Dennis Gilmore
a47f402383 make the atomic cloud image 6G
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-19 07:42:36 -05:00
Dennis Gilmore
ecd3d8386c installer iso format is date not compose_date
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-13 08:31:50 -05:00
Dennis Gilmore
d548f74c4b set the subvariant for Atomic correctly
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-11 18:02:06 -05:00
Dennis Gilmore
f31e9c5e28 add the git repo to get the ostree templates from
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-11 14:25:26 -05:00
Dennis Gilmore
4b65a9251e disable 32 bit x86 cloud images, and add the atmoic versions
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-11 14:10:27 -05:00
Dennis Gilmore
a51725821e set the arch as armhfp for docker base image
Signed-off-by: Dennis Gilmore <dennis@ra.ausil.us>
2016-04-08 17:55:50 -05:00
Dennis Gilmore
2f6e0dddec idisable ostree installer, I havbe a couple of questions first
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-08 12:12:48 -05:00
Dennis Gilmore
bb606ab707 add teh arch to the checksum file
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-08 10:21:27 -05:00
Dennis Gilmore
de86c341c1 renable ostree deliverables, enable docker base images for arm
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-08 10:18:48 -05:00
Dennis Gilmore
9e9a38faa9 disable all ostree bits for now
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-07 12:52:10 -05:00
Dennis Gilmore
5bade2932c atomic_repo needs to be ostree_repo
Signed-off-by: Dennis Gilmore <dennis@ra.ausil.us>
2016-04-06 07:49:48 -05:00
Dennis Gilmore
4e7ec0a210 set ostree and ostree_installer to be failable
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-04-05 13:22:53 -05:00