From 04b7ec3e4b5a5aefcf3a1aa88368454eecccbcfd Mon Sep 17 00:00:00 2001
From: Ryo Nakamura <upa@haeena.net>
Date: Sat, 19 Nov 2022 23:40:29 +0900
Subject: cleanup docker-related commands in cmake

TODO: add bruild procedure for async_write
---
 docker/centos-8.Dockerfile     | 2 +-
 docker/rocky-8.6.Dockerfile    | 4 ++--
 docker/ubuntu-20.04.Dockerfile | 2 +-
 docker/ubuntu-22.04.Dockerfile | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/centos-8.Dockerfile b/docker/centos-8.Dockerfile
index 3d60c72..a5e1ebe 100644
--- a/docker/centos-8.Dockerfile
+++ b/docker/centos-8.Dockerfile
@@ -28,7 +28,7 @@ RUN ${mscpdir}/scripts/install-build-deps.sh
 # build
 RUN cd ${mscpdir}			\
         && rm -rf build			\
-        && cmake -B build -DBUILD_PKG=1 \
+        && cmake -B build 		\
         && cd ${mscpdir}/build          \
 	&& make				\
 	&& cpack -G RPM CPackConfig.cmake
diff --git a/docker/rocky-8.6.Dockerfile b/docker/rocky-8.6.Dockerfile
index 422261b..90b804c 100644
--- a/docker/rocky-8.6.Dockerfile
+++ b/docker/rocky-8.6.Dockerfile
@@ -5,7 +5,7 @@ ARG mscpdir="/mscp"
 COPY . ${mscpdir}
 
 # install numpy and pytest, sshd for test, and rpm-build
-RUN set -ex && yum -y update && yum -y install \
+RUN set -ex && yum -y install \
 	python3 python3-pip openssh openssh-server openssh-clients rpm-build
 
 RUN python3 -m pip install numpy pytest
@@ -23,7 +23,7 @@ RUN ${mscpdir}/scripts/install-build-deps.sh
 # build
 RUN cd ${mscpdir}			\
         && rm -rf build			\
-        && cmake -B build -DBUILD_PKG=1 \
+        && cmake -B build		\
         && cd ${mscpdir}/build          \
 	&& make				\
 	&& cpack -G RPM CPackConfig.cmake
diff --git a/docker/ubuntu-20.04.Dockerfile b/docker/ubuntu-20.04.Dockerfile
index 9fdeea3..bc5fd86 100644
--- a/docker/ubuntu-20.04.Dockerfile
+++ b/docker/ubuntu-20.04.Dockerfile
@@ -28,7 +28,7 @@ RUN ${mscpdir}/scripts/install-build-deps.sh
 # build
 RUN cd ${mscpdir}			\
 	&& rm -rf build			\
-	&& cmake -B build -DBUILD_PKG=1	\
+	&& cmake -B build		\
 	&& cd ${mscpdir}/build		\
 	&& make				\
 	&& cpack -G DEB CPackConfig.cmake 
diff --git a/docker/ubuntu-22.04.Dockerfile b/docker/ubuntu-22.04.Dockerfile
index 0f4ab9c..73f4307 100644
--- a/docker/ubuntu-22.04.Dockerfile
+++ b/docker/ubuntu-22.04.Dockerfile
@@ -28,7 +28,7 @@ RUN ${mscpdir}/scripts/install-build-deps.sh
 # build
 RUN cd ${mscpdir}			\
 	&& rm -rf build			\
-	&& cmake -B build -DBUILD_PKG=1	\
+	&& cmake -B build		\
 	&& cd ${mscpdir}/build		\
 	&& make				\
 	&& cpack -G DEB CPackConfig.cmake 
-- 
cgit v1.2.3