This is the second step of the conversion. All mpp.yaml json files were loaded and dumped again with pyyaml. It was tweaked to keep the order of keys and to save multi-line strings in the "flow" style. This was done, so the GPG keys are kept on one line. Otherwise, they take up too much visual space. There is no functional change in this commit.
155 lines
7.6 KiB
YAML
155 lines
7.6 KiB
YAML
version: '2'
|
|
pipelines:
|
|
- mpp-import-pipeline:
|
|
path: f34-build-v2.json
|
|
id: build
|
|
runner: org.osbuild.fedora34
|
|
- name: ostree-tree
|
|
build: name:build
|
|
stages:
|
|
- type: org.osbuild.rpm
|
|
options:
|
|
gpgkeys:
|
|
- "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
|
|
inputs:
|
|
packages:
|
|
type: org.osbuild.files
|
|
origin: org.osbuild.source
|
|
mpp-depsolve:
|
|
architecture: x86_64
|
|
module-platform-id: f34
|
|
repos:
|
|
- id: default
|
|
baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/
|
|
packages:
|
|
- '@cloud-server-environment'
|
|
- chrony
|
|
- dracut-config-generic
|
|
- grub2-pc
|
|
- kernel-core
|
|
- langpacks-en
|
|
- nss-altfiles
|
|
- ostree
|
|
- polkit
|
|
- rpm-ostree
|
|
- selinux-policy-targeted
|
|
- systemd-udev
|
|
excludes:
|
|
- dracut-config-rescue
|
|
- type: org.osbuild.locale
|
|
options:
|
|
language: en_US.UTF-8
|
|
- type: org.osbuild.selinux
|
|
options:
|
|
file_contexts: etc/selinux/targeted/contexts/files/file_contexts
|
|
- type: org.osbuild.ostree.preptree
|
|
options:
|
|
etc_group_members:
|
|
- wheel
|
|
- docker
|
|
- name: ostree-commit
|
|
build: name:build
|
|
stages:
|
|
- type: org.osbuild.ostree.init
|
|
options:
|
|
path: /repo
|
|
- type: org.osbuild.ostree.commit
|
|
inputs:
|
|
tree:
|
|
type: org.osbuild.tree
|
|
origin: org.osbuild.pipeline
|
|
references:
|
|
- name:ostree-tree
|
|
options:
|
|
ref: fedora/x86_64/osbuild
|
|
os_version: '34'
|
|
- name: container-tree
|
|
build: name:build
|
|
stages:
|
|
- type: org.osbuild.rpm
|
|
inputs:
|
|
packages:
|
|
type: org.osbuild.files
|
|
origin: org.osbuild.source
|
|
mpp-depsolve:
|
|
architecture: x86_64
|
|
module-platform-id: f34
|
|
repos:
|
|
- id: default
|
|
baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/
|
|
packages:
|
|
- fedora-release-container
|
|
- bash
|
|
- coreutils
|
|
- glibc-minimal-langpack
|
|
- rpm
|
|
- shadow-utils
|
|
- sssd-client
|
|
- util-linux
|
|
- microdnf
|
|
- httpd
|
|
excludes:
|
|
- kernel
|
|
- dosfstools
|
|
- e2fsprogs
|
|
- fuse-libs
|
|
- gnupg2-smime
|
|
- libss
|
|
- pinentry
|
|
- shared-mime-info
|
|
- trousers
|
|
- xkeyboard-config
|
|
- grubby
|
|
options:
|
|
gpgkeys:
|
|
- "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
|
|
exclude:
|
|
docs: true
|
|
- type: org.osbuild.locale
|
|
options:
|
|
language: en_US.UTF-8
|
|
- name: container-ostree
|
|
build: name:build
|
|
stages:
|
|
- type: org.osbuild.ostree.init
|
|
options:
|
|
path: /var/www/html/repo
|
|
- type: org.osbuild.ostree.pull
|
|
options:
|
|
repo: /var/www/html/repo
|
|
inputs:
|
|
commits:
|
|
type: org.osbuild.ostree
|
|
origin: org.osbuild.pipeline
|
|
references:
|
|
name:ostree-commit:
|
|
ref: fedora/x86_64/osbuild
|
|
- name: container
|
|
build: name:build
|
|
stages:
|
|
- type: org.osbuild.oci-archive
|
|
inputs:
|
|
base:
|
|
type: org.osbuild.tree
|
|
origin: org.osbuild.pipeline
|
|
references:
|
|
- name:container-tree
|
|
layer.1:
|
|
type: org.osbuild.tree
|
|
origin: org.osbuild.pipeline
|
|
references:
|
|
- name:container-ostree
|
|
options:
|
|
architecture: amd64
|
|
filename: fedora-container.tar
|
|
config:
|
|
Cmd:
|
|
- httpd
|
|
- -D
|
|
- FOREGROUND
|
|
ExposedPorts:
|
|
- '80'
|
|
annotations:
|
|
org.osbuild.ostree.repo: /var/www/html/repo
|
|
org.osbuild.ostree.ref: fedora/x86_64/osbuild
|
|
org.osbuild.ostree.layer: '1'
|