From 0eb7ef68604a4aa563b6896ca23dcd96a6d98f84 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Tue, 3 Jan 2017 15:46:20 +0000 Subject: [PATCH] Publish ui from within dockerfile --- circle.yml | 2 +- ui/Dockerfile.build | 10 ++++++++++ ui/Makefile | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 ui/Dockerfile.build diff --git a/circle.yml b/circle.yml index a5dba7c0..15a08bdd 100644 --- a/circle.yml +++ b/circle.yml @@ -32,7 +32,7 @@ deployment: branch: master commands: - ./bin/docker-login - - make -C ui publish + - make -C ui publish | sed '/NPM_TOKEN/d' - make -j2 build - make -j2 push - ./bin/deploy diff --git a/ui/Dockerfile.build b/ui/Dockerfile.build new file mode 100644 index 00000000..db4a754e --- /dev/null +++ b/ui/Dockerfile.build @@ -0,0 +1,10 @@ +FROM quay.io/yldio/alpine-node-containerpilot:latest +ARG NPM_TOKEN +ARG CIRCLE_BUILD_NUM +ENV NPM_TOKEN ${NPM_TOKEN} +ENV CIRCLE_BUILD_NUM ${CIRCLE_BUILD_NUM} +RUN echo -e "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc +RUN NODE_ENV=production make compile +RUN make install +RUN npm version 0.0.1-${CIRCLE_BUILD_NUM} +RUN npm publish --tag alpha --access public diff --git a/ui/Makefile b/ui/Makefile index 777be564..c277b23c 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -68,5 +68,4 @@ lint-ci: .PHONY: publish publish: - npm version 0.0.1-$(CIRCLE_BUILD_NUM) - npm publish --tag alpha --access public + docker build --build-arg NPM_TOKEN=${NPM_TOKEN} --build-arg CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM} -f Dockerfile.build .