Merge pull request #747 from davidcassany/integration_and_packaging

Linux: Integration and packaging

Author: mattfarina

.github/workflows/package.yaml

@@ -87,12 +87,24 @@ jobs:
     - uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu-')
       with:
-        name: Rancher Desktop-linux.zip
-        path: dist/rancher-desktop*.zip
+        name: Rancher Desktop-linux.tar.gz
+        path: dist/rancher-desktop*.tar.gz
         if-no-files-found: error
     - uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu-')
       with:
         name: Rancher Desktop.flatpak
         path: dist/Rancher Desktop*.flatpak
         if-no-files-found: error
+    - uses: actions/upload-artifact@v2
+      if: startsWith(matrix.os, 'ubuntu-')
+      with:
+        name: Rancher Desktop.rpm
+        path: dist/rancher-desktop*.rpm
+        if-no-files-found: error
+    - uses: actions/upload-artifact@v2
+      if: startsWith(matrix.os, 'ubuntu-')
+      with:
+        name: Rancher Desktop.deb
+        path: dist/rancher-desktop*.deb
+        if-no-files-found: error

background.ts

@@ -124,7 +124,7 @@ async function doFirstRun() {
     return;
   }
   await window.openFirstRun();
-  if (os.platform() === 'darwin') {
+  if (os.platform() === 'darwin' || os.platform() === 'linux') {
     await Promise.all([
       linkResource('helm', true),
       linkResource('kim', true), // TODO: Remove when we stop shipping kim
@@ -509,10 +509,20 @@ async function getVersion() {
  * @param state -- true to symlink, false to delete
  */
 async function linkResource(name: string, state: boolean): Promise<Error | null> {
-  const linkPath = path.join('/usr/local/bin', name);
+  const linkPath = path.join(paths.integration, name);
+
+  let err: Error | null = await new Promise((resolve) => {
+    fs.mkdir(paths.integration, { recursive: true }, resolve);
+  });
+
+  if (err) {
+    console.error(`Error creating the directory ${ paths.integration }: ${ err.message }`);
+
+    return err;
+  }
 
   if (state) {
-    const err: Error | null = await new Promise((resolve) => {
+    err = await new Promise((resolve) => {
       fs.symlink(resources.executable(name), linkPath, 'file', resolve);
     });
 
@@ -522,7 +532,7 @@ async function linkResource(name: string, state: boolean): Promise<Error | null>
       return err;
     }
   } else {
-    const err: Error | null = await new Promise((resolve) => {
+    err = await new Promise((resolve) => {
       fs.unlink(linkPath, resolve);
     });
 

electron-builder.yml

@@ -29,7 +29,10 @@ win:
 linux:
   category: Utility
   executableName: rancher-desktop
-  target: [ flatpak, zip ]
+  icon: ./resources/icons/linux
+  synopsis: Kubernetes and container management on the desktop
+  description: Rancher Desktop is an open-source project to bring Kubernetes and container management to the desktop
+  target: [ flatpak, tar.gz, rpm, deb ]
 nsis:
   license: LICENSE
   include: build/installer.nsh
@@ -53,6 +56,7 @@ flatpak:
   - --filesystem=xdg-data/rancher-desktop:create
   - --filesystem=~/.kube:create
   - --filesystem=~/.kuberlr:create
+  - --filesystem=~/.local/bin:create
   - --device=kvm
   - --device=dri
   - --share=ipc
@@ -63,30 +67,24 @@ flatpak:
   - --own-name=org.kde.* # Fixes Tray in KDE (https://github.com/flathub/im.riot.Riot/issues/100)
   files:                                                                        
   - ["dist/linux-unpacked/resources/resources/linux/misc/io.rancherdesktop.app.appdata.xml", "/share/metainfo/io.rancherdesktop.app.appdata.xml"]
-  - ["dist/linux-unpacked/resources/resources/linux/misc/io.rancherdesktop.app.desktop", "/share/applications/io.rancherdesktop.app.desktop"]
-  - ["dist/linux-unpacked/resources/resources/icons/linux", "/share/icons/hicolor"]
   modules:
   - name: qemu
     config-opts:
     - "--disable-user"
     - "--enable-kvm"
-    #- "--enable-vde"
     - "--target-list=x86_64-softmmu"
     sources:
     - type: archive
       url: https://download.qemu.org/qemu-6.1.0.tar.xz
       sha256: eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96
-    # We do not need vde under linux
-    #modules:
-    #- name: vde-2
-    #  sources:
-    #  - type: git
-    #    url: https://github.com/virtualsquare/vde-2
-    #    tag: vde-2
-    #  buildsystem: simple
-    #  build-commands:
-    #  - | 
-    #    cd 2.3.2
-    #    autoreconf --install
-    #    ./configure --prefix=/app --disable-python --disable-cryptcab
-    #    make install
+rpm:
+  depends:
+  - qemu
+  fpm:
+  # Make sure not /usr/lib/.build-id artifacts are created
+  # This config is likely to be missing in non RPM based hosts
+  - --rpm-rpmbuild-define=_build_id_links none
+deb:
+  depends:
+  - qemu-utils
+  - qemu-system-x86

…linux/misc/io.rancherdesktop.app.desktop flatpak/io.rancherdesktop.app.desktopresources/linux/misc/io.rancherdesktop.app.desktop renamed to flatpak/io.rancherdesktop.app.desktop resources/linux/misc/io.rancherdesktop.app.desktop renamed to flatpak/io.rancherdesktop.app.desktop

@@ -22,6 +22,7 @@ finish-args:
   - --filesystem=xdg-data/rancher-desktop:create
   - --filesystem=~/.kube:create
   - --filesystem=~/.kuberlr:create
+  - --filesystem=~/.local/bin:create
   - --talk-name=org.freedesktop.Notifications
   - --own-name=org.kde.*
 modules:
@@ -32,49 +33,41 @@ modules:
       - type: dir
         path: ..
         dest: lib
+      - type: file
+        path: io.rancherdesktop.app.desktop
+        dest: lib
       - type: script
         dest-filename: electron-wrapper
         commands:
           - |
             export TMPDIR="$XDG_RUNTIME_DIR/app/$FLATPAK_ID"
 
-            if [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
-              zypak-wrapper /app/lib/io.rancherdesktop.app/rancher-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"
-            else
-              zypak-wrapper /app/lib/io.rancherdesktop.app/rancher-desktop "$@"
-            fi
+            zypak-wrapper /app/lib/io.rancherdesktop.app/rancher-desktop "$@"
     build-commands:
       # Bundle electron build after npm run build -- --linux --publish=never 
       - cp -a dist/linux*unpacked /app/lib/io.rancherdesktop.app
       # Include FreeDesktop integration files at expected locations
       - rm -rf /app/share/metainfo /app/share/icons /app/share/applications
-      - mkdir -p /app/share/metainfo /app/share/icons /app/share/applications
+      - mkdir -p /app/share/metainfo /app/share/applications
+      - |
+        icons=/app/lib/io.rancherdesktop.app/resources/resources/icons/linux
+        for img in $(ls "${icons}"); do 
+          size="${img//rancher-desktop./}"
+          size="${size%%.png}"
+          mkdir "/app/share/icons/hicolor/${size}/apps" -p
+          cp "${icons}/${img}" "/app/share/icons/hicolor/${size}/apps/io.rancherdesktop.app.png"
+        done
       - cp /app/lib/io.rancherdesktop.app/resources/resources/linux/misc/io.rancherdesktop.app.appdata.xml /app/share/metainfo
-      - cp /app/lib/io.rancherdesktop.app/resources/resources/linux/misc/io.rancherdesktop.app.desktop /app/share/applications
-      - cp -r /app/lib/io.rancherdesktop.app/resources/resources/icons/linux /app/share/icons/hicolor
+      - mv io.rancherdesktop.app.desktop /app/share/applications
       # Install app wrapper
       - install -Dm755 -t /app/bin/ ../electron-wrapper
     modules:
     - name: qemu
       config-opts:
       - "--disable-user"
       - "--enable-kvm"
-      #- "--enable-vde"
       - "--target-list=x86_64-softmmu"
       sources:
       - type: archive
         url: https://download.qemu.org/qemu-6.1.0.tar.xz
         sha256: eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96
-      #modules:
-      #- name: vde-2
-      #  sources:
-      #  - type: git
-      #    url: https://github.com/virtualsquare/vde-2
-      #    tag: vde-2
-      #  buildsystem: simple
-      #  build-commands:
-      #  - | 
-      #      cd 2.3.2
-      #      autoreconf --install
-      #      ./configure --prefix=/app --disable-python --disable-cryptcab
-      #      make install

flatpak/io.rancherdesktop.app.yml

@@ -2,6 +2,10 @@
   "name": "rancher-desktop",
   "license": "Apache-2.0",
   "version": "0.6.0",
+  "author": {
+     "name": "SUSE",
+     "email": "containers@suse.com"
+  },
   "engines": {
     "node": ">=14.14"
   },