Commit Graph

241 Commits

Author SHA1 Message Date
Dennis Gilmore
bdb072a84d Clean uup docker and cloud composes older than 3 weeks
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-05-25 09:43: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
Mohan Boddu
24aa3f723a Fix variant name to CloudImages
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-02-17 18:01:47 -05:00
Mohan Boddu
e31b51de77 Split Atomic and CloudImage
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-02-14 15:12:07 -05:00
Dusty Mabe
b28af80fd7
fedora-atomic: update lorax passed vars
previously we had done this in fedora.conf. We should have done this
in fedora-atomic.conf.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-02-09 17:38:30 -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
Dennis Gilmore
a41748acee include the newly made Cloud variant in the repos for the installer
This change allows us to replace packages in the anaconda installer
built as part of the compose

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-18 14:50:50 -06: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
a6b47158dc Docker Compose id not Atomic
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 11:23:37 -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
Dennis Gilmore
3eb43b0256 no longer make the docker base image as part of the atomic compose
As the docker base image was the only armfhp deliverable in the compose
no longer make the armhfp install tree as well

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2017-01-05 10:33:05 -06:00
Dusty Mabe
222e74556f
atomic: fix install location again
Since the RC1.3 location was cleaned up, pull everything from the
official location where F25 release content is.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-01-04 16:34:46 -05:00
Dusty Mabe
8e7041772b
Revert "pull the rpms from the Cloud install tree"
This reverts commit 8aa2d66e03.
There is some bug in pungi that causes this not to work for now so let's
revert so we can still get built images until we figure that out.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2016-12-20 22:28:01 -05:00
Dennis Gilmore
8aa2d66e03 pull the rpms from the Cloud install tree
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-12-20 12:37:38 -06: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
e205111d74 fix up finding the compose ids
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-19 15:27:40 -06:00
Dennis Gilmore
865eff65c5 use $arch not $basearch
for some reason basearch is incorrectly becoming arm not armhfp so
use $arch teh same as the f24 configs

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-18 22:30:35 -06:00
Dennis Gilmore
5fc3a1424f point the installer iso at the staged f25 release, this needs reverted once f25 is out
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-18 16:40:52 -06:00
Dennis Gilmore
c0e06d7be0 fix up urls for where repos are, only make cloud installers for armhfp and x86_64
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-18 16:39:42 -06:00
Dennis Gilmore
31ba28a3b0 pass the label to pungi-koji
Production composes have to have a label passed into them

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-17 08:58:03 -06:00
Dennis Gilmore
6cc79601cd Atomic: use the right sigs and remove nightly flag
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-17 08:53:35 -06:00
Dennis Gilmore
0c53aa8418 Atomic: Don't skip phases we now need
now that we are building the cloud variant every compose we need to
not skip some phases

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-17 08:48:58 -06:00
Dennis Gilmore
c22289cb6f cleanups for f25 implementation
use f25-build as the runroot channel. whats most important is the
packages that are installed into the install environments rather
than the install environment. Disable macboot on Cloud tree as it
does not target macs at all

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-17 08:16:05 -06:00
Lubomír Sedlář
860c5a7e73 Allow using newer packages
Cloud variant is now enabled as well. It will create repository from a
special tag with some newer packages and run lorax on them. This install
tree will then be used for building images. The repos still point the
the original location outside of compose. The updates repo is used as
well.

For ostree installer, a runroot tag should be used that includes newer
packages as needed. This tag is shared for both ostree installer and
buildinstall. Using different tags would require a code change in Pungi.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-11-17 08:13:21 -06:00
Dennis Gilmore
37c17f0678 pull comps from pagure for two week composes
The two week script was still pulling comps from fedorahostes

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-17 07:58:38 -06:00
Mohan Boddu
213b93e559 Setup for f25 final
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-11-15 10:02:02 -06:00
Dennis Gilmore
8f52fc6399 update config for RC-1.2
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-11-09 11:21:42 -06:00
Mohan Boddu
ee28dae051 f25 final compose script
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-11-08 15:09:40 -06:00
Mohan Boddu
6fef4c4f97 Setup for f25 final
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-11-08 11:00:28 -06: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
Dennis Gilmore
7407b7e891 use _ in the file names as needed for naming policy
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-10-04 20:43:42 -05:00
Dennis Gilmore
2ce4e4fd64 fix up the beta config to validae with pungi 4.1.9
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-10-04 20:40:33 -05:00
Dennis Gilmore
51e7da5e63 add workstation-ostree-support to Workstation variant
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-10-04 15:27:29 -05:00
Dennis Gilmore
ac2768b243 set the treename for spam-o-matic so emails say they are f25 #64
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2016-09-29 17:28:56 -05:00
Lubomír Sedlář
f604948b13 Clean up config for Atomic
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-09-22 14:39:59 +02: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
Mohan Boddu
8ad2025f06 Adding Fedora 25 beta and atomic configs
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-09-19 15:01:15 -04:00
Mohan Boddu
51ad37b92e Adding Fedora 25 beta and OStree configs
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-09-19 14:12:54 -04:00
Kevin Fenzi
b0bff8e833 Change this hard coded 1.1 to be label so install images have Alpha in the name
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2016-08-24 15:45:58 -06:00
Mohan Boddu
9ff37a7ad6 Change global release float to string
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2016-08-23 16:16:04 -05:00