Merge ~peppepetra/grafana-snap:lp1995279 into grafana-snap:master

[Giuseppe Petralia]

[Mert Kirpici (mertkirpici)]

+1

review: Approve

[Chi Wai CHAN (raychan96)]

lgtm

review: Approve

[Eric Chen (eric-chen)]

review: Needs Information

[Eric Chen (eric-chen)]

Will this patch also solve this?
https://bugs.launchpad.net/charm-grafana/+bug/1995279

review: Needs Information

[Giuseppe Petralia (peppepetra)]

Reply in line

[Giuseppe Petralia (peppepetra)]

> Will this patch also solve this?
> https://bugs.launchpad.net/charm-grafana/+bug/1995279

Yes version 7.5.17 address the issue with LP#1995279

[Erhan Sunar (esunar)]

LGTM

review: Approve

[Eric Chen (eric-chen)]

Reply inline.

review: Needs Information

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 966c991..97d5228 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 7.4.1
+version: 7.5.17
 summary: feature rich metrics dashboard and graph editor
 base: core20
 description: |
@@ -50,23 +50,29 @@ parts:
         cp -p -r ${SNAPCRAFT_PART_BUILD}/conf/* ${SNAPCRAFT_PART_INSTALL}/conf/
   grafana-ui:
     after: [grafana]
-    plugin: npm
+    plugin: nil
     source-type: git
     source: https://github.com/grafana/grafana.git
     source-tag: v${SNAPCRAFT_PROJECT_VERSION}
-    npm-node-version: '14.15.5'
-    build-packages: [python2-minimal,python2-dev]
+    build-packages: [curl,python2-minimal,python2-dev]
     override-build: |
       set -x
-      # https://forum.snapcraft.io/t/issue-with-nodejs-plugin-when-using-base-keyword/11109/8
-      echo "unsafe-perm = true" > ~/.npmrc
-      snapcraftctl build
+      curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
+      apt install -y nodejs
+      npm install --global yarn patch-package
+      # on arm, s390x, and ppc systems remove phantomjs as required from the
+      # package.json and yarn lock as it's not available from npm on those
+      # architectures
+      ARCH=$(uname -m)
+      case $ARCH in
+      arm*|s390*|ppc*)
+        yarn remove phantomjs-prebuilt --ignore-workspace-root-check;;
+      esac
       export PYTHON=/usr/bin/python2
-      # XXX check if needed
       PATH="$PATH:$SNAPCRAFT_PART_BUILD/node_modules/.bin:$SNAPCRAFT_PART_INSTALL/bin"
       NODE_ENV="production"
-      npm install -g --prefix $SNAPCRAFT_PART_INSTALL yarn
       yarn install --pure-lockfile --no-progress
+      npx browserslist@latest --update-db
       yarn build
       cp -rf public ${SNAPCRAFT_PART_INSTALL}/public
       cp -rf tools ${SNAPCRAFT_PART_INSTALL}/tools