diff options
| author | Ryo Nakamura <upa@haeena.net> | 2022-11-05 21:26:34 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2022-11-05 21:26:34 +0900 |
| commit | fc56c53d04d7e499a91d0526842a6072477ddb96 (patch) | |
| tree | 3675ef7d3b2f904b843f1c969b0f9b110c458724 /CMakeLists.txt | |
| parent | 6e6e5066c7ad83ad2daf8f8ccbe7231211e41c97 (diff) | |
add install-build-deps.sh and fix docker build procedure
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a182a7..f69f144 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,24 +70,24 @@ if(BUILD_PKG) # Ubuntu 20.04 add_custom_target(package-ubuntu-20.04-in-docker COMMENT "Build mscp in ubuntu 20.04 docker container" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker - COMMAND docker build -t mscp-ubuntu:20.04 -f Dockerfile-ubuntu-20.04 . + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND docker build -t mscp-ubuntu:20.04 -f docker/Dockerfile-ubuntu-20.04 . COMMAND docker run -it --rm -v ${CMAKE_BINARY_DIR}:/out mscp-ubuntu:20.04 cp /mscp/build/mscp_${PROJECT_VERSION}-ubuntu-20.04-${ARCH}.deb /out/) # Ubuntu 22.04 add_custom_target(package-ubuntu-22.04-in-docker COMMENT "Build mscp in ubuntu 22.04 docker container" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker - COMMAND docker build -t mscp-ubuntu:22.04 -f Dockerfile-ubuntu-22.04 . + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND docker build -t mscp-ubuntu:22.04 -f docker/Dockerfile-ubuntu-22.04 . COMMAND docker run -it --rm -v ${CMAKE_BINARY_DIR}:/out mscp-ubuntu:22.04 cp /mscp/build/mscp_${PROJECT_VERSION}-ubuntu-22.04-${ARCH}.deb /out/) # CentOS 8 add_custom_target(package-centos-8-in-docker COMMENT "Build mscp in centos 8 docker container" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker - COMMAND docker build -t mscp-centos:8 -f Dockerfile-centos-8 . + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND docker build -t mscp-centos:8 -f docker/Dockerfile-centos-8 . COMMAND docker run -it --rm -v ${CMAKE_BINARY_DIR}:/out mscp-centos:8 cp /mscp/build/mscp_${PROJECT_VERSION}-centos-8-${ARCH}.rpm /out/) |