feat: unify build steps and package architecture for all packages

odigos-io · Jun 25, 2024 · 233c07c · 233c07c
1 parent 2fa77c5
commit 233c07c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -147,7 +147,9 @@ jobs:
         run: |
           docker buildx build --load --platform=linux/${{ matrix.arch }} -t ${{ matrix.service }} .
           docker create --name tc ${{ matrix.service }}
-          docker cp $(docker create --name tc frontend):/app ./dist && docker rm tc
+          mkdir -p ./dist/app
+          docker cp tc:/app ./dist
+          docker rm tc
           sed -i -E 's/version: .*$/version: '"${TAG}"'/' nfpm.yaml
           sed -i -E 's/arch: .*$/arch: '"${{ matrix.pkg_arch }}"'/' nfpm.yaml
           nfpm pkg --packager rpm --target dist/

diff --git a/frontend/distribution/systemd.service b/frontend/distribution/systemd.service
@@ -3,7 +3,7 @@ Description=Odigos Demo Frontend Service
 After=network.target
 
 [Service]
-ExecStart=java -jar /usr/share/java/odigos-demo-frontend.jar
+ExecStart=java -jar /opt/odigos-demo-frontend/app/odigos-demo-frontend.jar
 KillMode=mixed
 Restart=on-failure
 RestartSec=1s

diff --git a/frontend/nfpm.yaml b/frontend/nfpm.yaml
@@ -12,8 +12,8 @@ homepage: https://odigos.io
 contents:
 - src: distribution/systemd.service
   dst: /lib/systemd/system/odigos-demo-frontend.service
-- src: ./dist/frontend.jar
-  dst: /usr/share/java/odigos-demo-frontend.jar
+- src: ./dist/app
+  dst: /opt/odigos-demo-frontend
 scripts:
   preinstall: ./distribution/preinstall.sh
   postinstall: ./distribution/postinstall.sh