New githubapi docker

.dockerignore

@@ -0,0 +1,4 @@
+config.*.json
+node_modules
+result.json
+package-lock.json

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:slim
+
+WORKDIR /app
+
+# avoid package-lock.json since this can run on multi-platforms
+COPY package.json ./
+
+RUN apt-get update && apt-get install --no-install-recommends -y git && rm -rf /var/lib/apt/lists/*
+RUN npm install --only=production && npm audit fix
+
+COPY . .
+
+EXPOSE 8089
+CMD ["npm","start"]

arm32v7.Dockerfile

@@ -0,0 +1,14 @@
+FROM arm32v7/node:11.6.0-stretch-slim
+
+WORKDIR /app
+
+# avoid package-lock.json since this can run on multi-platforms
+COPY package.json ./
+
+RUN apt-get update && apt-get install --no-install-recommends -y git && rm -rf /var/lib/apt/lists/*
+RUN npm install --only=production && npm audit fix
+
+COPY . .
+
+EXPOSE 8089
+CMD ["npm","start"]

docker.md

@@ -0,0 +1,56 @@
+# Build
+
+    docker build -t andresvidal/speedtracker-api .
+
+## Build on ARM devices
+
+Clone Git repo locally:
+
+    git clone https://github.com/andresvidal/speedtracker-api.git
+
+and run:
+
+    docker build -f arm32v7.Dockerfile -t andresvidal/speedtracker-api:arm32v7 .
+
+# Run
+
+## With inline config:
+
+    docker run -it --rm \
+    --name speedtracker-api \
+    -p 8089:8089 \
+    -e "PORT=8089" \
+    -e "WPT_KEY=..." \
+    -e "GITHUB_TOKEN=..." \
+    -e "PAGESPEED_API_KEY=..." \
+    -e "MONGODB_URI=..." \
+    andresvidal/speedtracker-api:latest
+
+## With local config file:
+
+    docker run -it --rm \
+    --name speedtracker-api \
+    -v `pwd`:/app \
+    -p 8089:8089 \
+    andresvidal/speedtracker-api:latest
+
+## On ARM32 devices as a Daemon:
+
+    docker run -d \
+    --name speedtracker-api \
+    --restart=unless-stopped \
+    -p 8089:8089 \
+    -e "PORT=8089" \
+    -e "WPT_KEY=..." \
+    -e "GITHUB_TOKEN=..." \
+    -e "PAGESPEED_API_KEY=..." \
+    -e "MONGODB_URI=..." \
+    andresvidal/speedtracker-api:arm32v7
+
+## Interactive session:
+
+    docker exec -it speedtracker-api bash
+
+# Test 
+
+    http://<server-ip>:8089/v1/test/{USERNAME}/{REPOSITORY}/{BRANCH}/{PROFILE}?key={KEY}

lib/GitHub.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const GitHubApi = require('github')
+//const GitHubApi = require('github')
+const GitHubApi = require('@octokit/rest') // keeping const "GitHubApi" for context
 
 const GITHUB_CONNECT = 1
 

lib/SpeedTracker.js

@@ -90,17 +90,17 @@ SpeedTracker.prototype._getPagespeedScore = function (url) {
 }
 
 SpeedTracker.prototype._getRemoteFile = function (file) {
-  return this.options.remote.api.repos.getContent({
-    user: this.options.user,
+  return this.options.remote.api.repos.getContents({
+    owner: this.options.user,
     repo: this.options.repo,
     path: file,
     ref: this.options.branch
   }).then(response => {
-    var content = new Buffer(response.content, 'base64').toString()
+    var content = new Buffer.from(response.data.content, 'base64').toString()
 
     return {
       content,
-      sha: response.sha
+      sha: response.data.sha
     }
   })
 }
@@ -219,14 +219,14 @@ SpeedTracker.prototype._saveTest = function (profile, content, isScheduled) {
 
       // Append results
       Utils.mergeObject(payload._r, content, payload._ts.length)
-
+      
       return this.options.remote.api.repos.updateFile({
-        user: this.options.user,
+        owner: this.options.user,
         repo: this.options.repo,
         branch: this.options.branch,
         path: path,
         sha: data.sha,
-        content: new Buffer(JSON.stringify(payload)).toString('base64'),
+        content: new Buffer.from(JSON.stringify(payload)).toString('base64'),
         message: message
       })
     } catch (err) {
@@ -243,15 +243,15 @@ SpeedTracker.prototype._saveTest = function (profile, content, isScheduled) {
       Utils.mergeObject(payload._r, content)
 
       return this.options.remote.api.repos.createFile({
-        user: this.options.user,
+        owner: this.options.user,
         repo: this.options.repo,
         branch: this.options.branch,
         path: path,
-        content: new Buffer(JSON.stringify(payload)).toString('base64'),
+        content: new Buffer.from(JSON.stringify(payload)).toString('base64'),
         message: message
       })      
     } else {
-      return Promise.reject(Utils.buildError('CORRUPT_RESULT_FILE'))
+      return Promise.reject(Utils.buildError('CORRUPT_RESULT_FILE_ERR2'))
     }
   })
 }