Merge pull request #2281 from weaveworks/ui-pkg-fix

Changed ui-build-pkg job to use a docker container

Makefile

@@ -150,6 +150,13 @@ client-start: $(SCOPE_UI_BUILD_UPTODATE)
 		-v $(shell pwd)/client/build:/home/weave/build -e WEBPACK_SERVER_HOST \
 		$(SCOPE_UI_BUILD_IMAGE) npm start
 
+tmp/weave-scope.tgz: $(shell find client/app -type f) $(SCOPE_UI_BUILD_UPTODATE)
+	$(sudo) docker run $(RUN_FLAGS) \
+	-v $(shell pwd)/client/app:/home/weave/app \
+	-v $(shell pwd)/tmp:/home/weave/tmp \
+	$(SCOPE_UI_BUILD_IMAGE) \
+	npm run bundle
+
 else
 
 client/build/index.html:
@@ -173,10 +180,10 @@ ui-upload: client/build-external/index.html
 	AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
 	aws s3 cp client/build-external/ s3://static.weave.works/scope-ui/ --recursive --exclude '*.html'
 
-ui-build-pkg:
+ui-pkg-upload: tmp/weave-scope.tgz
 	AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
 	AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
-	cd client && npm run build-pkg && npm run bundle && npm run s3-publish
+	aws s3 cp tmp/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/weave-scope.tgz
 
 clean:
 	$(GO) clean ./...

circle.yml

@@ -81,7 +81,7 @@ deployment:
           )) &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./tools/image-tag) &&
-          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload))
+          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload && make ui-build-pkg))
         )
       - |
         test -z "${QUAY_USER}" || (

client/package.json

@@ -94,16 +94,15 @@
     "build": "webpack --config webpack.production.config.js",
     "build-external": "EXTERNAL=true webpack --config webpack.production.config.js",
     "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 --quiet && mv weave-scope-$npm_package_version.tgz weave-scope.tgz",
+    "bundle": "npm run build-pkg && npm pack ./build-pkg && mv weave-scope-$npm_package_version.tgz ./tmp/weave-scope.tgz",
     "start": "node server.js",
     "start-production": "NODE_ENV=production node server.js",
     "test": "jest",
     "coveralls": "cat coverage/lcov.info | coveralls",
     "lint": "eslint app",
     "clean": "rm build/app.js",
     "noprobe": "../scope stop && ../scope launch --no-probe --app.window 8760h",
-    "loadreport": "npm run noprobe && sleep 1 && curl -X POST -H \"Content-Type: application/json\" http://$BACKEND_HOST/api/report -d",
-    "s3-publish": "aws s3 cp weave-scope.tgz s3://weaveworks-npm-modules/weave-scope/ --acl public-read"
+    "loadreport": "npm run noprobe && sleep 1 && curl -X POST -H \"Content-Type: application/json\" http://$BACKEND_HOST/api/report -d"
   },
   "jest": {
     "transform": {