diff --git a/Containerfile b/Containerfile index 2c7a141..dcfbbd1 100644 --- a/Containerfile +++ b/Containerfile @@ -21,8 +21,6 @@ VOLUME /build-container-installer/build VOLUME /build-container-installer/repos VOLUME /cache -RUN dnf repolist - RUN dnf install -y make && make install-deps ENTRYPOINT ["/bin/bash", "/build-container-installer/entrypoint.sh"] diff --git a/Makefile b/Makefile index acf2d0d..aecc4fe 100644 --- a/Makefile +++ b/Makefile @@ -224,11 +224,11 @@ clean: rm -f $(_BASE_DIR)/*.log || true install-deps: - if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi - $(PACKAGE_MANAGER) install -y lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git + if [ "$(PACKAGE_MANAGER)" == "dnf" ]; then disable="--disablerepo='ubi-*'"; fi; \ + $(PACKAGE_MANAGER) install -y ${disable} lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git install-test-deps: - if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi + if [ "$(PACKAGE_MANAGER)" == "dnf" ]; then disable="--disablerepo='ubi-*'"; fi; \ $(PACKAGE_MANAGER) install -y qemu qemu-utils xorriso unzip qemu-system-x86 netcat socat jq isomd5sum ansible make coreutils squashfs-tools