Dockerfile don't delete cache

eea · Jan 8, 2021 · 22c4d50 · 22c4d50
1 parent 287ba98
commit 22c4d50
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -53,8 +53,7 @@ RUN missdev --config=jsconfig.json --output=develop
 # USER node
 
 RUN RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn \
- && RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build \
- && rm -rf /home/node/.cache
+ && RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build
 
 EXPOSE 3000 3001 4000 4001
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
         node(label: 'docker-host') {
           script {
             checkout scm
-            if (env.BRANCH_NAME == 'test') {
+            if (env.BRANCH_NAME == 'master') {
               tagName = 'latest'
             } else {
               tagName = "$BRANCH_NAME"

diff --git a/entrypoint-prod.sh b/entrypoint-prod.sh
@@ -62,7 +62,6 @@ if [[ "$1" == "cypress"* ]]; then
   RAZZLE_API_PATH=$RAZZLE_API_PATH yarn start &
 
   cd /opt/frontend
-  exec bash -c "wait-on -t $TIMEOUT http://localhost:3000 && NODE_ENV=production CYPRESS_API_PATH=$CYPRESS_API_PATH ./node_modules/cypress/bin/cypress install"
   exec bash -c "wait-on -t $TIMEOUT http://localhost:3000 && NODE_ENV=production CYPRESS_API_PATH=$CYPRESS_API_PATH ./node_modules/cypress/bin/cypress run"
 fi