diff options
| author | Ryo Nakamura <upa@haeena.net> | 2022-11-20 00:37:01 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2022-11-20 00:37:01 +0900 |
| commit | 8395c05d672d7f6117c2854218435ff71cf23294 (patch) | |
| tree | 64a9272e9b37a4059ccd93e0250210345311b06d /docker | |
| parent | 04b7ec3e4b5a5aefcf3a1aa88368454eecccbcfd (diff) | |
fix CMakeLists.txt
* install mscp from package at docker build phase.
* add docker-*-all custom targets.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos-8.Dockerfile | 3 | ||||
| -rw-r--r-- | docker/rocky-8.6.Dockerfile | 3 | ||||
| -rw-r--r-- | docker/ubuntu-20.04.Dockerfile | 3 | ||||
| -rw-r--r-- | docker/ubuntu-22.04.Dockerfile | 3 |
4 files changed, 8 insertions, 4 deletions
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 |