diff --git a/PilotGo-2.0.1.tar.gz b/PilotGo-2.0.1.tar.gz index d9826271efadd4e894dafa868744a6c1e9a2b402..4e804383d71da239bdbd440eade4550c009c6cf9 100644 Binary files a/PilotGo-2.0.1.tar.gz and b/PilotGo-2.0.1.tar.gz differ diff --git a/PilotGo-web.tar.gz b/PilotGo-web.tar.gz index b3124bfec00e0f3cd7a1ca8c8db40aadd166dc1c..90d00e5553bcb612855d142a17fbc1aff803ad27 100644 Binary files a/PilotGo-web.tar.gz and b/PilotGo-web.tar.gz differ diff --git a/PilotGo.spec b/PilotGo.spec old mode 100755 new mode 100644 index 75f1ddff61aa2bd8346ecb4559afaf0af968575a..a4a415f475512ac842d58de5b5d91a8566d88713 --- a/PilotGo.spec +++ b/PilotGo.spec @@ -2,12 +2,15 @@ Name: PilotGo Version: 2.0.1 -Release: 1 +Release: 2 Summary: PilotGo is a plugable operation platform written in go License: MulanPSL-2.0 URL: https://gitee.com/openeuler/PilotGo Source0: https://gitee.com/openeuler/PilotGo/%{name}-%{version}.tar.gz -# Web packaged from ace055a5584482443e9fcfcca906cff2949f6c9b +# tar -xvf Source0 +# cd %{name}-%{version}/frontend/ +# run 'yarn install and yarn build' in it +# tar -czvf PilotGo-web.tar.gz ../frontend/dist/ Source1: PilotGo-web.tar.gz BuildRequires: systemd BuildRequires: golang @@ -34,18 +37,18 @@ PilotGo agent. tar -xzvf %{SOURCE1} %build +cp -rf frontend/dist/static frontend/dist/index.html pkg/app/server/resource/ # server -GO111MODULE=on go build -mod=vendor -o PilotGo-server pkg/app/server/main.go +GO111MODULE=on go build -mod=vendor -o PilotGo-server -tags="production" pkg/app/server/main.go # agent GO111MODULE=on go build -mod=vendor -o PilotGo-agent pkg/app/agent/main.go %install -mkdir -p %{buildroot}/opt/PilotGo/{server/{frontend,log},agent/log} +mkdir -p %{buildroot}/opt/PilotGo/{server/log,agent/log} # server install -D -m 0755 PilotGo-server %{buildroot}/opt/PilotGo/server install -D -m 0644 config_server.yaml.templete %{buildroot}/opt/PilotGo/server/config_server.yaml install -D -m 0644 scripts/service/PilotGo-server.service %{buildroot}%{_unitdir}/PilotGo-server.service -cp -rf frontend/dist %{buildroot}/opt/PilotGo/server/frontend # agent install -D -m 0755 PilotGo-agent %{buildroot}/opt/PilotGo/agent install -D -m 0644 config_agent.yaml.templete %{buildroot}/opt/PilotGo/agent/config_agent.yaml @@ -75,8 +78,6 @@ install -D -m 0644 scripts/service/PilotGo-agent.service %{buildroot}%{_unitdir} %dir /opt/PilotGo/server/log /opt/PilotGo/server/PilotGo-server /opt/PilotGo/server/config_server.yaml -%dir /opt/PilotGo/server/frontend -/opt/PilotGo/server/frontend/dist %{_unitdir}/PilotGo-server.service %files agent @@ -89,6 +90,9 @@ install -D -m 0644 scripts/service/PilotGo-agent.service %{buildroot}%{_unitdir} %changelog +* Mon Sep 25 2023 jianxinyu - 2.0.1-2 +- Fix some bugs + * Fri Sep 01 2023 jianxinyu - 2.0.1-1 - Package init