From 0d4389120bbf198a366b85196b88582d657d7583 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Sun, 11 Feb 2018 21:46:24 +0100 Subject: [PATCH] Remove failsafe for docker cp --- Dockerfile | 2 +- ci/Jenkinsfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4652bd45..e99435d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM node:9.5.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app +ENV PATH="/usr/src/app/node_modules/.bin:${PATH}" COPY package.json /usr/src/app/package.json COPY yarn.lock /usr/src/app/yarn.lock RUN npm run ci:install -ENV PATH="/usr/src/app/node_modules/.bin:${PATH}" COPY . /usr/src/app diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index d5c3ccae1..3f4413b48 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -17,7 +17,6 @@ node(label: 'linux') { catchError { stage('ci:build') { sh 'docker run -i --name ipfs-companion-build-${JOB_BASE_NAME}-${BUILD_NUMBER} ipfs-companion:${JOB_BASE_NAME}-${BUILD_NUMBER} npm run ci:build' - sh 'docker wait ipfs-companion-build-${JOB_BASE_NAME}-${BUILD_NUMBER}' // fix random 'docker cp' errors that copy nothing sh 'docker cp ipfs-companion-build-${JOB_BASE_NAME}-${BUILD_NUMBER}:/usr/src/app/build/. build/' // copy package archiveArtifacts artifacts: 'build/*.zip', fingerprint: true }