The script gets a label as a command line argument, and this is manually
handled by adding it as `--label=$1` to the pungi-koji command. We
should not add this argument to another time.
This avoid problem with Pungi 4.1.17 which reports an error when seeing
unknown arguments (which were silently ignored before).
Fixes: https://pagure.io/pungi/issue/682
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
