File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed
Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -168,10 +168,13 @@ nbdev:
168168rpm : builder
169169 echo " \033[1;34mStarting RPM build for $$ {CONTAINER_PLATFORM}.\033[0m"
170170 mkdir -p build/rpm
171+ $(CONTAINER_ENGINE ) rm -f noobaa-rpm-build-env
171172 $(CONTAINER_ENGINE ) build $(CONTAINER_PLATFORM_FLAG ) $(CPUSET ) -f src/deploy/RPM_build/RPM.Dockerfile $(CACHE_FLAG ) -t $(NOOBAA_RPM_TAG ) --build-arg CENTOS_VER=$(CENTOS_VER ) --build-arg BUILD_S3SELECT=$(BUILD_S3SELECT ) --build-arg BUILD_S3SELECT_PARQUET=$(BUILD_S3SELECT_PARQUET ) --build-arg SRPM_ONLY=$(SRPM_ONLY ) --build-arg GIT_COMMIT=$(GIT_COMMIT ) . $(REDIRECT_STDOUT )
172173 echo " \033[1;32mImage \" $( NOOBAA_RPM_TAG) \" is ready.\033[0m"
173174 echo " Generating RPM..."
174- $(CONTAINER_ENGINE ) run --rm -v $(PWD ) /build/rpm:/export:z -t $(NOOBAA_RPM_TAG )
175+ $(CONTAINER_ENGINE ) run --name noobaa-rpm-build-env -t $(NOOBAA_RPM_TAG )
176+ mkdir -p $(PWD ) /build/rpm && $(CONTAINER_ENGINE ) cp noobaa-rpm-build-env:/export/. $(PWD ) /build/rpm/
177+ $(CONTAINER_ENGINE ) rm -f noobaa-rpm-build-env
175178 echo " \033[1;32mRPM for platform \" $( NOOBAA_RPM_TAG) \" is ready in build/rpm.\033[0m" ;
176179.PHONY : rpm
177180
Original file line number Diff line number Diff line change @@ -53,4 +53,5 @@ ENV BUILD_S3SELECT=${BUILD_S3SELECT}
5353ENV BUILD_S3SELECT_PARQUET=${BUILD_S3SELECT_PARQUET}
5454ENV CENTOS_VER=${CENTOS_VER}
5555ENV SRPM_ONLY=${SRPM_ONLY}
56+ RUN mkdir -p /export
5657CMD ./packagerpm.sh /export /build
You can’t perform that action at this time.
0 commit comments