diff --git a/.travis.yml b/.travis.yml index bb4dd28e9..5b446571a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ jobs: - bash <(curl -s https://codecov.io/bash) -X gcov - stage: e2e script: npm run build && npm run e2e:docker - before_deploy: 'npm run build:war' + before_deploy: 'npm run build:tomcat' deploy: provider: s3 region: $ARTIFACTS_REGION diff --git a/package.json b/package.json index d57e2bc19..a0767ff77 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "start:prod": "npm run server-versions && ng serve --prod --open", "build": "npm run server-versions && node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng build app --prod", "build:dev": "npm run server-versions && ng build", - "build:war": "npm run build -- --base-href ./ && mkdir -p dist/tomcat && jar -cvf dist/tomcat/content-app.war -C dist/app/ .", "test": "ng test app --code-coverage", "test:ci": "ng test app --code-coverage --watch=false", "lint": "ng lint", @@ -22,7 +21,9 @@ "e2e:docker": "npm run start:docker && npm run e2e && npm run stop:docker", "spellcheck": "cspell 'src/**/*.ts' 'e2e/**/*.ts' 'projects/**/*.ts'", "inspect.bundle": "ng build app --prod --stats-json && npx webpack-bundle-analyzer dist/app/stats.json", - "format:check": "prettier --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"" + "format:check": "prettier --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", + "build.tomcat": "npm run build -- --base-href ./ && mkdir -p dist/tomcat && jar -cvf dist/tomcat/content-app.war -C dist/app/ .", + "start.tomcat": "docker run -v `pwd`/dist/tomcat/content-app.war:/usr/local/tomcat/webapps/content-app.war -it -p 4080:8080 tomcat || exit 0" }, "private": true, "dependencies": {