瀏覽代碼

Updated vulnerable dependancy

Jamie Curnow 7 年之前
父節點
當前提交
f86e91bef2
共有 4 個文件被更改,包括 23 次插入3 次删除
  1. 1 1
      bin/gulp
  2. 1 1
      bin/npm
  3. 20 0
      bin/yarn
  4. 1 1
      manager/package.json

+ 1 - 1
bin/gulp

@@ -16,5 +16,5 @@ fi
 
 cd "$CODEBASE"
 
-docker-compose run --no-deps --rm -w /srv/manager app gulp $@
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app gulp $@
 exit $?

+ 1 - 1
bin/npm

@@ -16,5 +16,5 @@ fi
 
 cd "$CODEBASE"
 
-docker-compose run --no-deps --rm -w /srv/manager app npm $@
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app npm $@
 exit $?

+ 20 - 0
bin/yarn

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if hash realpath 2>/dev/null; then
+    export CODEBASE=$(realpath $SCRIPT_DIR/..)
+elif hash grealpath 2>/dev/null; then
+    export CODEBASE=$(grealpath $SCRIPT_DIR/..)
+else
+    export CODEBASE=$(readlink -e $SCRIPT_DIR/..)
+fi
+
+if [ -z "$CODEBASE" ]; then
+    echo "Unable to determine absolute codebase directory"
+    exit 1
+fi
+
+cd "$CODEBASE"
+
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app yarn $@
+exit $?

+ 1 - 1
manager/package.json

@@ -38,7 +38,7 @@
     "gulp-concat-util": "^0.5.5",
     "gulp-ejs": "^3.0.1",
     "gulp-imagemin": "^3.3.0",
-    "gulp-sass": "^3.2.1",
+    "gulp-sass": "^4.0.1",
     "gulp-util": "^3.0.8",
     "image-size": "^0.6.1",
     "jquery": "^3.2.1",