diff --git a/node_modules.tar.gz b/node_modules.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..25aba0ab116709816a82faf85c670a07c42af8fc Binary files /dev/null and b/node_modules.tar.gz differ diff --git a/sysom.spec b/sysom.spec old mode 100755 new mode 100644 index 7db0b01c582ba1cd8be7d6608000ab6f268eefca..8fb0b675b8d2f96b3b5ee59db784fb48f43e5dbd --- a/sysom.spec +++ b/sysom.spec @@ -7,10 +7,14 @@ Release: %{anolis_release}%{?dist} Summary: SysOM Server License: MIT Source0: https://gitee.com/anolis/sysom/repository/archive/v2.0/sysom-2.0.tar.gz +Source1: node_modules.tar.gz +Source2: yarn-1.22.19.tar.gz Requires: python3 python3-pip python3-virtualenv mariadb-server supervisor nginx redis wget nfs-utils rpcbind iproute -BuildRequires: nodejs >= 16.14.0 npm >= 8.3.1 +BuildRequires: nodejs >= 1:16.14.0 npm >= 8.3.1 URL: https://gitee.com/anolis/sysom +BuildArch: x86_64 + %description SysOM is committed to building an automatic operation and maintenance platform that integrates host management, configuration and deployment, @@ -18,19 +22,22 @@ monitoring and alarm, exception diagnosis, security audit and other functions %prep %setup -q -n %{name}-%{version} +pushd sysom_web +tar -xvf %{SOURCE1} +pushd node_modules +tar -xvf %{SOURCE2} +popd +popd + %build echo "build sysom ..........." echo ${PWD} -npm install -g yarn -pushd sysom_web || exit -yarn -yarn build -popd || exit +pushd sysom_web +sh ./node_modules/yarn/bin/yarn build --offline +popd echo "build sysom end" -%pre - %install mkdir -p %{buildroot}/usr/local/sysom/server/target/sysom_web mkdir -p %{buildroot}/usr/local/sysom/server/vmcore/vmcore-nfs @@ -39,15 +46,15 @@ mkdir -p %{buildroot}/usr/local/sysom/server/conf/ mkdir -p %{buildroot}/usr/local/sysom/init_scripts/ mkdir -p %{buildroot}/etc/supervisord.d/ mkdir -p %{buildroot}/usr/lib/systemd/system/ -cp -a sysom_api %{buildroot}/usr/local/sysom/server/target -cp -r sysom_web/dist/* %{buildroot}/usr/local/sysom/server/target/sysom_web/ -cp tools/deploy/nginx.conf %{buildroot}/usr/local/sysom/server/conf/ -cp tools/deploy/sysom.conf %{buildroot}/usr/local/sysom/server/conf/ -cp tools/deploy/sysom.ini %{buildroot}/etc/supervisord.d/ -cp tools/deploy/sysom-server.service %{buildroot}/usr/lib/systemd/system/ -cp -a script/* %{buildroot}/usr/local/sysom/init_scripts/ -cp tools/deploy/task-service.ini %{buildroot}/etc/supervisord.d/ -cp tools/deploy/channel-service.ini %{buildroot}/etc/supervisord.d/ +cp -a -p sysom_api %{buildroot}/usr/local/sysom/server/target +cp -r -p sysom_web/dist/* %{buildroot}/usr/local/sysom/server/target/sysom_web/ +cp -p tools/deploy/nginx.conf %{buildroot}/usr/local/sysom/server/conf/ +cp -p tools/deploy/sysom.conf %{buildroot}/usr/local/sysom/server/conf/ +cp -p tools/deploy/sysom.ini %{buildroot}/etc/supervisord.d/ +cp -p tools/deploy/sysom-server.service %{buildroot}/usr/lib/systemd/system/ +cp -a -p script/* %{buildroot}/usr/local/sysom/init_scripts/ +cp -p tools/deploy/task-service.ini %{buildroot}/etc/supervisord.d/ +cp -p tools/deploy/channel-service.ini %{buildroot}/etc/supervisord.d/ %files /usr/local/sysom/ @@ -79,5 +86,5 @@ rm -f /etc/supervisord.d/channel-service.ini rm -rf /usr/local/sysom %changelog -* Mon Aug 8 2022 huangtuquan - 2.0 +* Mon Aug 8 2022 huangtuquan - 2.0-1 - sysom server release 2.0 diff --git a/yarn-1.22.19.tar.gz b/yarn-1.22.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..73deff005bc7998fe1809c534fab2deaf8f6b16b Binary files /dev/null and b/yarn-1.22.19.tar.gz differ