Skip to content

Commit 723b175

Browse files
tomasfratrikmatejmatuska
authored andcommitted
Update build container up to f42
* Add installation of python3-setuptools * Drop fedora versions 35-40 Jira: RHELMISC-13271
1 parent e62e4e1 commit 723b175

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ help:
8282
@echo " build create the RPM"
8383
@echo " build_container create the RPM in container"
8484
@echo " - set BUILD_CONTAINER to select the container"
85-
@echo " - available containers are:" el{8..9} f{35..40} rawhide
85+
@echo " - available containers are:" el{8..9} f{41..42} rawhide
8686
@echo " - this can't be used to build in parallel,"
8787
@echo " as build containers operate on the same files"
8888
@echo " clean_containers clean container images used for building"
@@ -154,7 +154,7 @@ build_container:
154154
el[8-9]) \
155155
_CONT_FILE="Containerfile.ubi"$${BUILD_CONTAINER: -1}; \
156156
;; \
157-
f3[5-9]|f40|rawhide) \
157+
f4[1-2]|rawhide) \
158158
[ $$BUILD_CONTAINER = rawhide ] && VERSION=latest || VERSION=$${BUILD_CONTAINER: -2}; \
159159
_CONT_FILE=".Containerfile.$${BUILD_CONTAINER}"; \
160160
cp res/container-builds/Containerfile.fedora_generic res/container-builds/$$_CONT_FILE && \
@@ -165,7 +165,7 @@ build_container:
165165
exit 1; \
166166
;; \
167167
*) \
168-
echo "Available containers are: el{8..9} f{35..40} rawhide"; \
168+
echo "Available containers are: el{8..9} f{41..42} rawhide"; \
169169
exit 1; \
170170
;; \
171171
esac && \
@@ -234,7 +234,7 @@ test_container_all:
234234
done
235235

236236
clean_containers:
237-
@for i in "leapp-build-"{el8,el9,f35,f36,rawhide} "leapp-tests-rhel"{8..10}; do \
237+
@for i in leapp-build-el{8,9} leapp-build-f{41..42} leapp-build-rawhide leapp-tests-rhel{8..10}; do \
238238
[ -z $$($(_CONTAINER_TOOL) images -q "$$i") ] || \
239239
$(_CONTAINER_TOOL) rmi "$$i" > /dev/null 2>&1 || :; \
240240
done

res/container-builds/Containerfile.fedora_generic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VOLUME /payload
55
ENV DIST_VERSION 8
66

77
RUN dnf update -y && \
8-
dnf install -y python3 make git rpm-build python3-devel
8+
dnf install -y python3 make git rpm-build python3-devel python3-setuptools
99
#yum install -y python3-pip && \ python3 -m pip install --upgrade pip==20.3.4
1010

1111
WORKDIR /payload

0 commit comments

Comments
 (0)