Make Docker image buildable on ARM (#2065)

* after yarn upgrade * after manually removing node-gyp as top level dependency
9 years ago · 556f68ab15
parent fdb2689a14
commit 556f68ab15
3 changed files with 19 additions and 59 deletions
--- a/1
+++ b/1
@ -17,6 +17,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
    postgresql-dev \
    libxml2-dev \
    libxslt-dev \
+    python \
    build-base" \
 && apk -U upgrade && apk add \
    $BUILD_DEPS \
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "mastodon",
-  "license" : "AGPL-3.0",
+  "license": "AGPL-3.0",
  "scripts": {
    "start": "babel-node ./streaming/index.js --presets es2015,stage-2",
    "storybook": "start-storybook -p 9001 -c storybook",
@ -38,7 +38,7 @@
    "intl": "^1.2.5",
    "jsdom": "^9.11.0",
    "mocha": "^3.2.0",
-    "node-sass": "^4.5.0",
+    "node-sass": "^4.5.2",
    "npmlog": "^4.0.2",
    "pg": "^6.1.2",
    "react": "^15.4.2",
--- a/yarn.lock
+++ b/yarn.lock
@ -289,13 +289,6 @@ array-includes@^3.0.2:
    define-properties "^1.1.2"
    es-abstract "^1.5.0"

-array-index@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
-  dependencies:
-    debug "^2.2.0"
-    es6-symbol "^3.0.2"
-
 array-map@~0.0.0:
  version "0.0.0"
  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
@ -2516,7 +2509,7 @@ es6-shim@^0.35.1:
  version "0.35.1"
  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.1.tgz#a23524009005b031ab4a352ac196dfdfd1144ab7"

-es6-symbol@3.1.1, es6-symbol@^3.0.2, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
  dependencies:
@ -2959,20 +2952,6 @@ fuzzysearch@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/fuzzysearch/-/fuzzysearch-1.0.3.tgz#dffc80f6d6b04223f2226aa79dd194231096d008"

-gauge@~2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.6.0.tgz#d35301ad18e96902b4751dcbbe40f4218b942a46"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-color "^0.1.7"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gauge@~2.7.1:
  version "2.7.2"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774"
@ -3110,10 +3089,6 @@ has-ansi@^2.0.0:
  dependencies:
    ansi-regex "^2.0.0"

-has-color@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-
 has-flag@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
@ -4209,8 +4184,8 @@ node-fetch@^1.0.1:
    is-stream "^1.0.1"

 node-gyp@^3.3.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.4.0.tgz#dda558393b3ecbbe24c9e6b8703c71194c63fa36"
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.0.tgz#7474f63a3a0501161dda0b6341f022f14c423fa6"
  dependencies:
    fstream "^1.0.0"
    glob "^7.0.3"
@ -4218,12 +4193,11 @@ node-gyp@^3.3.1:
    minimatch "^3.0.2"
    mkdirp "^0.5.0"
    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
    osenv "0"
-    path-array "^1.0.0"
    request "2"
    rimraf "2"
-    semver "2.x || 3.x || 4 || 5"
+    semver "~5.3.0"
    tar "^2.0.0"
    which "1"

@ -4297,9 +4271,9 @@ node-pre-gyp@^0.6.29:
    tar "~2.2.0"
    tar-pack "~3.1.0"

-node-sass@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.0.tgz#532e37bad0ce587348c831535dbc98ea4289508b"
+node-sass@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.2.tgz#4012fa2bd129b1d6365117e88d9da0500d99da64"
  dependencies:
    async-foreach "^0.1.3"
    chalk "^1.1.1"
@ -4316,7 +4290,7 @@ node-sass@^4.5.0:
    nan "^2.3.2"
    node-gyp "^3.3.1"
    npmlog "^4.0.0"
-    request "^2.61.0"
+    request "^2.79.0"
    sass-graph "^2.1.1"
    stdout-stream "^1.4.0"

@ -4360,16 +4334,7 @@ normalize-url@^1.4.0:
    query-string "^4.1.0"
    sort-keys "^1.0.0"

-"npmlog@0 || 1 || 2 || 3":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-3.1.2.tgz#2d46fa874337af9498a2f12bb43d8d0be4a36873"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.6.0"
-    set-blocking "~2.0.0"
-
-npmlog@4.x, npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@4.x, npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
  dependencies:
@ -4586,12 +4551,6 @@ parseurl@~1.3.0, parseurl@~1.3.1:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"

-path-array@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271"
-  dependencies:
-    array-index "^1.0.0"
-
 path-browserify@0.0.0, path-browserify@~0.0.0:
  version "0.0.0"
  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
@ -5620,7 +5579,7 @@ repeating@^2.0.0:
  dependencies:
    is-finite "^1.0.0"

-request@2, request@2.x, request@^2.61.0, request@^2.79.0:
+request@2, request@2.x, request@^2.79.0:
  version "2.79.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
  dependencies:
@ -5780,14 +5739,14 @@ section-iterator@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/section-iterator/-/section-iterator-2.0.0.tgz#bf444d7afeeb94ad43c39ad2fb26151627ccba2a"

-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
-
-semver@~5.3.0:
+"semver@2 || 3 || 4 || 5", semver@~5.3.0:
  version "5.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

+semver@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
+
 send@0.14.2:
  version "0.14.2"
  resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"