_config: fix docker build #32
7
_config
7
_config
@@ -207,16 +207,19 @@ Macros:
|
||||
|
||||
%if 0%{?_is_in_project}
|
||||
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 kernel-default 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 kernel-default 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
|
||||
|
||||
# conflict of provider of docker-stable with docker, docker-stable-buildx with docker-buildx
|
||||
Prefer: -docker-stable -docker-stable-buildx
|
||||
|
||||
# %if "%_project" == "openSUSE:Leap:16.0"
|
||||
# BuildFlags: excludebuild:openh264
|
||||
# %endif
|
||||
|
||||
Reference in New Issue
Block a user