From b3f3dc180e31f5693c26ed8df6184b44ca234986 Mon Sep 17 00:00:00 2001 From: jpellizzari Date: Tue, 24 Jan 2017 17:21:31 -0800 Subject: [PATCH] Makefile changes --- Makefile | 4 +++- client/package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e30aaedcf..a564585fa 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,9 @@ ui-upload: client/build-external/index.html aws s3 cp client/build-external/ s3://static.weave.works/scope-ui/ --recursive --exclude '*.html' ui-build-pkg: - cd client && npm run build-pkg && npm run s3-publish + AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \ + AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \ + cd client && npm run build-pkg && aws s3 cp weave-scope.tgz s3://weaveworks-npm-modules/weave-scope/ --acl public-read clean: $(GO) clean ./... diff --git a/client/package.json b/client/package.json index b81b9230a..5c5eedc18 100644 --- a/client/package.json +++ b/client/package.json @@ -90,7 +90,7 @@ "scripts": { "build": "webpack --config webpack.production.config.js", "build-external": "EXTERNAL=true webpack --config webpack.production.config.js", - "build-pkg": "babel app/scripts --ignore __tests__ --out-dir build-pkg && cp package.json build-pkg/ && cp -R app/styles build-pkg/", + "build-pkg": "mkdir -p build-pkg && node node_modules/.bin/babel app/scripts --ignore __tests__ --out-dir build-pkg && cp package.json build-pkg/ && cp -R app/styles build-pkg/", "bundle": "npm pack build-pkg && mv weave-scope-$npm_package_version.tgz weave-scope.tgz", "start": "node server.js", "start-production": "NODE_ENV=production node server.js",