From 8395c05d672d7f6117c2854218435ff71cf23294 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Sun, 20 Nov 2022 00:37:01 +0900 Subject: fix CMakeLists.txt * install mscp from package at docker build phase. * add docker-*-all custom targets. --- docker/centos-8.Dockerfile | 3 ++- docker/rocky-8.6.Dockerfile | 3 ++- docker/ubuntu-20.04.Dockerfile | 3 ++- docker/ubuntu-22.04.Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/centos-8.Dockerfile b/docker/centos-8.Dockerfile index a5e1ebe..586b1e9 100644 --- a/docker/centos-8.Dockerfile +++ b/docker/centos-8.Dockerfile @@ -31,5 +31,6 @@ RUN cd ${mscpdir} \ && cmake -B build \ && cd ${mscpdir}/build \ && make \ - && cpack -G RPM CPackConfig.cmake + && cpack -G RPM CPackConfig.cmake \ + && rpm -iv *.rpm diff --git a/docker/rocky-8.6.Dockerfile b/docker/rocky-8.6.Dockerfile index 90b804c..323129c 100644 --- a/docker/rocky-8.6.Dockerfile +++ b/docker/rocky-8.6.Dockerfile @@ -26,5 +26,6 @@ RUN cd ${mscpdir} \ && cmake -B build \ && cd ${mscpdir}/build \ && make \ - && cpack -G RPM CPackConfig.cmake + && cpack -G RPM CPackConfig.cmake \ + && rpm -iv *.rpm diff --git a/docker/ubuntu-20.04.Dockerfile b/docker/ubuntu-20.04.Dockerfile index bc5fd86..0ca4148 100644 --- a/docker/ubuntu-20.04.Dockerfile +++ b/docker/ubuntu-20.04.Dockerfile @@ -31,4 +31,5 @@ RUN cd ${mscpdir} \ && cmake -B build \ && cd ${mscpdir}/build \ && make \ - && cpack -G DEB CPackConfig.cmake + && cpack -G DEB CPackConfig.cmake \ + && dpkg -i *.deb diff --git a/docker/ubuntu-22.04.Dockerfile b/docker/ubuntu-22.04.Dockerfile index 73f4307..c00f695 100644 --- a/docker/ubuntu-22.04.Dockerfile +++ b/docker/ubuntu-22.04.Dockerfile @@ -31,4 +31,5 @@ RUN cd ${mscpdir} \ && cmake -B build \ && cd ${mscpdir}/build \ && make \ - && cpack -G DEB CPackConfig.cmake + && cpack -G DEB CPackConfig.cmake \ + && dpkg -i *.deb -- cgit v1.2.3