diff options
| -rw-r--r-- | Dockerfile/.gitignore | 2 | ||||
| -rw-r--r-- | Dockerfile/README.md | 6 | ||||
| -rw-r--r-- | Dockerfile/build-srpm.Dockerfile | 22 |
3 files changed, 4 insertions, 26 deletions
diff --git a/Dockerfile/.gitignore b/Dockerfile/.gitignore index f7083c9..adab824 100644 --- a/Dockerfile/.gitignore +++ b/Dockerfile/.gitignore @@ -1,3 +1,3 @@ # generated by cmake -rpmbuild.Dockerfile +build-srpm.Dockerfile diff --git a/Dockerfile/README.md b/Dockerfile/README.md index e901664..ff6d45b 100644 --- a/Dockerfile/README.md +++ b/Dockerfile/README.md @@ -13,7 +13,7 @@ Run test: docker run --init --rm mscp-DST:VER /mscp/scripts/test-in-container.sh ``` -`cmake` provides custom targets to build and test mscp in the -containers. See `make docker-*` targets. `make docker-build-all` -builds all container images and `make docker-test-all` runs the test +Custom targets to build and test mscp in the containers are provided +via `cmake`. See `make docker-*` targets. `make docker-build-all` +builds all container images, and `make docker-test-all` runs the test in all container images.
\ No newline at end of file diff --git a/Dockerfile/build-srpm.Dockerfile b/Dockerfile/build-srpm.Dockerfile deleted file mode 100644 index b614fc1..0000000 --- a/Dockerfile/build-srpm.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM rockylinux:9 - -# install pytest, sshd for test, and rpm-build -RUN set -ex && yum -y install rpm-build rpmdevtools - -ARG mscpdir="/mscp-0.1.3" -ARG mscptgz="mscp-0.1.3.tar.gz" - -COPY . ${mscpdir} - -# install build dependency -RUN ${mscpdir}/scripts/install-build-deps.sh - -# prepare rpmbuild -RUN rpmdev-setuptree \ - && rm -rf ${mscpdir}/build \ - && tar zcvf /${mscptgz} --exclude-vcs ${mscpdir} \ - && cp /${mscptgz} ~/rpmbuild/SOURCES/ \ - && cp ${mscpdir}/rpm/mscp.spec ~/rpmbuild/SPECS/ - -# build rpm and src.rpm -RUN rpmbuild -ba ~/rpmbuild/SPECS/mscp.spec |