mirror of
https://github.com/upa/mscp.git
synced 2026-05-13 13:57:30 +08:00
fix CMakeLists.txt
* install mscp from package at docker build phase. * add docker-*-all custom targets.
This commit is contained in:
@@ -107,26 +107,15 @@ include(CPack)
|
|||||||
# Custom targets to build and test mscp in docker containers.
|
# Custom targets to build and test mscp in docker containers.
|
||||||
# foreach(IN ZIP_LISTS) (cmake >= 3.17) can shorten the following lists.
|
# foreach(IN ZIP_LISTS) (cmake >= 3.17) can shorten the following lists.
|
||||||
# However, ubuntu 20.04 has cmake 3.16.3.
|
# However, ubuntu 20.04 has cmake 3.16.3.
|
||||||
list(APPEND DIST_NAMES ubuntu)
|
list(APPEND DIST_NAMES ubuntu ubuntu centos rocky)
|
||||||
list(APPEND DIST_VERS 20.04)
|
list(APPEND DIST_VERS 20.04 22.04 8 8.6)
|
||||||
list(APPEND DIST_PKGS deb)
|
list(APPEND DIST_PKGS deb deb rpm rpm)
|
||||||
|
|
||||||
list(APPEND DIST_NAMES ubuntu)
|
|
||||||
list(APPEND DIST_VERS 22.04)
|
|
||||||
list(APPEND DIST_PKGS deb)
|
|
||||||
|
|
||||||
list(APPEND DIST_NAMES centos)
|
|
||||||
list(APPEND DIST_VERS 8)
|
|
||||||
list(APPEND DIST_PKGS rpm)
|
|
||||||
|
|
||||||
list(APPEND DIST_NAMES rocky)
|
|
||||||
list(APPEND DIST_VERS 8.6)
|
|
||||||
list(APPEND DIST_PKGS rpm)
|
|
||||||
|
|
||||||
foreach(x RANGE 3)
|
foreach(x RANGE 3)
|
||||||
list(GET DIST_NAMES ${x} DIST_NAME)
|
list(GET DIST_NAMES ${x} DIST_NAME)
|
||||||
list(GET DIST_VERS ${x} DIST_VER)
|
list(GET DIST_VERS ${x} DIST_VER)
|
||||||
list(GET DIST_PKGS ${x} DIST_PKG)
|
list(GET DIST_PKGS ${x} DIST_PKG)
|
||||||
|
|
||||||
set(DOCKER_IMAGE mscp-${DIST_NAME}:${DIST_VER})
|
set(DOCKER_IMAGE mscp-${DIST_NAME}:${DIST_VER})
|
||||||
set(DOCKER_INDEX ${DIST_NAME}-${DIST_VER})
|
set(DOCKER_INDEX ${DIST_NAME}-${DIST_VER})
|
||||||
set(PKG_FILE_NAME
|
set(PKG_FILE_NAME
|
||||||
@@ -150,4 +139,12 @@ foreach(x RANGE 3)
|
|||||||
COMMAND
|
COMMAND
|
||||||
docker run --rm -v ${CMAKE_BINARY_DIR}:/out ${DOCKER_IMAGE}
|
docker run --rm -v ${CMAKE_BINARY_DIR}:/out ${DOCKER_IMAGE}
|
||||||
cp /mscp/build/${PKG_FILE_NAME} /out/)
|
cp /mscp/build/${PKG_FILE_NAME} /out/)
|
||||||
|
|
||||||
|
list(APPEND DOCKER_BUILDS docker-build-${DOCKER_INDEX})
|
||||||
|
list(APPEND DOCKER_TESTS docker-test-${DOCKER_INDEX})
|
||||||
|
list(APPEND DOCKER_PKGS docker-pkg-${DOCKER_INDEX})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
add_custom_target(docker-build-all DEPENDS ${DOCKER_BUILDS})
|
||||||
|
add_custom_target(docker-test-all DEPENDS ${DOCKER_TESTS})
|
||||||
|
add_custom_target(docker-pkg-all DEPENDS ${DOCKER_PKGS})
|
||||||
|
|||||||
@@ -31,5 +31,6 @@ RUN cd ${mscpdir} \
|
|||||||
&& cmake -B build \
|
&& cmake -B build \
|
||||||
&& cd ${mscpdir}/build \
|
&& cd ${mscpdir}/build \
|
||||||
&& make \
|
&& make \
|
||||||
&& cpack -G RPM CPackConfig.cmake
|
&& cpack -G RPM CPackConfig.cmake \
|
||||||
|
&& rpm -iv *.rpm
|
||||||
|
|
||||||
|
|||||||
@@ -26,5 +26,6 @@ RUN cd ${mscpdir} \
|
|||||||
&& cmake -B build \
|
&& cmake -B build \
|
||||||
&& cd ${mscpdir}/build \
|
&& cd ${mscpdir}/build \
|
||||||
&& make \
|
&& make \
|
||||||
&& cpack -G RPM CPackConfig.cmake
|
&& cpack -G RPM CPackConfig.cmake \
|
||||||
|
&& rpm -iv *.rpm
|
||||||
|
|
||||||
|
|||||||
@@ -31,4 +31,5 @@ RUN cd ${mscpdir} \
|
|||||||
&& cmake -B build \
|
&& cmake -B build \
|
||||||
&& cd ${mscpdir}/build \
|
&& cd ${mscpdir}/build \
|
||||||
&& make \
|
&& make \
|
||||||
&& cpack -G DEB CPackConfig.cmake
|
&& cpack -G DEB CPackConfig.cmake \
|
||||||
|
&& dpkg -i *.deb
|
||||||
|
|||||||
@@ -31,4 +31,5 @@ RUN cd ${mscpdir} \
|
|||||||
&& cmake -B build \
|
&& cmake -B build \
|
||||||
&& cd ${mscpdir}/build \
|
&& cd ${mscpdir}/build \
|
||||||
&& make \
|
&& make \
|
||||||
&& cpack -G DEB CPackConfig.cmake
|
&& cpack -G DEB CPackConfig.cmake \
|
||||||
|
&& dpkg -i *.deb
|
||||||
|
|||||||
@@ -1,31 +1,13 @@
|
|||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
#
|
#
|
||||||
# Run this script in docker containers. This script installs mscp from built package
|
# Run this script in mscp docker containers.
|
||||||
# and run test for mscp in the installed path.
|
# This script runs end-to-end test with installed mscp.
|
||||||
|
|
||||||
source /etc/os-release
|
|
||||||
script_dir=$(cd $(dirname ${0}) && pwd)
|
script_dir=$(cd $(dirname ${0}) && pwd)
|
||||||
cd $script_dir
|
cd $script_dir
|
||||||
project_version=$(cat ../VERSION)
|
|
||||||
arch=$(uname -p)
|
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
# install package
|
|
||||||
case $ID in
|
|
||||||
ubuntu*)
|
|
||||||
pkg=mscp_${project_version}-${ID}-${VERSION_ID}-${arch}.deb
|
|
||||||
dpkg -i ../build/$pkg
|
|
||||||
;;
|
|
||||||
centos* | rhel* | rocky*)
|
|
||||||
pkg=mscp_${project_version}-${ID}-${VERSION_ID}-${arch}.rpm
|
|
||||||
rpm -iv ../build/$pkg
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "unsupported test platform: $ID"
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Run sshd
|
# Run sshd
|
||||||
if [ ! -e /var/run/sshd.pid ]; then
|
if [ ! -e /var/run/sshd.pid ]; then
|
||||||
/usr/sbin/sshd
|
/usr/sbin/sshd
|
||||||
|
|||||||
Reference in New Issue
Block a user