Merge pull request 'Update _config for Docker based builds' (#43) from dcassany/SLFO:config_main into main
Reviewed-on: https://src.suse.de/products/SLFO/pulls/43 Reviewed-by: Libor Miksik <libor.miksik@suse.com> Reviewed-by: Marco Strigl <marco.strigl@suse.com>
This commit is contained in:
commit
61d49f9f24
7
_config
7
_config
@ -1,4 +1,3 @@
|
||||
|
||||
BuildFlags: setvcs
|
||||
BuildFlags: slsaversion:v1
|
||||
|
||||
@ -323,18 +322,18 @@ Macros:
|
||||
|
||||
%if "%_project" == "SUSE:SLFO:Main:Build" || "%_project" == "SUSE:ALP:Products:Basalt:1.0"
|
||||
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE container-build-checks-strict
|
||||
Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
|
||||
Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
|
||||
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE container-build-checks-strict skopeo umoci
|
||||
%else
|
||||
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86"
|
||||
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict
|
||||
Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
|
||||
Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
|
||||
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
|
||||
%else
|
||||
# That ignore seems not to make sense - we only inject -strict based on specific projects already
|
||||
Ignore: container-build-checks-strict
|
||||
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-SUSE
|
||||
Substitute: system-packages:docker kmod kernel-default dummy-release docker createrepo_c container-build-checks-vendor-SUSE skopeo umoci
|
||||
Substitute: system-packages:docker kmod docker createrepo_c container-build-checks-vendor-SUSE skopeo umoci
|
||||
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-SUSE skopeo umoci
|
||||
%endif
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user