Commit 147f6b42 authored by Luke Texon's avatar Luke Texon

Cleaned up YMl file and stopped unnecessary testing

parent 023fdc3c
Pipeline #113546 failed
......@@ -12,34 +12,30 @@ variables:
build docker:
stage: build_docker
tags:
- ljt18_webapp
tags: ljt18_webapp
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker system prune -f
- docker build -t $DOCKER_IMAGE .
- docker push $DOCKER_IMAGE
compile:
compile java:
stage: build
image: $DOCKER_IMAGE_LATEST
script:
- mvn compile
script: mvn compile
test:
testing:
stage: test
image: $DOCKER_IMAGE_LATEST
script:
- mvn test
script: mvn test
deploy to vm:
stage: staging
tags:
- ljt18_webapp
tags: ljt18_webapp
before_script:
- pkill -f screen || echo "Screen not running"
script:
- mvn package
- mvn -Dmaven.test.skip=true package
- export PORT=5000
- screen -dm sh target/bin/simplewebapp
environment:
......@@ -49,8 +45,7 @@ deploy to vm:
deploy to heroku:
stage: production
image: $DOCKER_IMAGE_LATEST
script:
- dpl --provider=heroku --app=ljt18-simplewebapp --api-key=$API_KEY
script: dpl --provider=heroku --app=ljt18-simplewebapp --api-key=$API_KEY
environment:
name: Heroku
url: https://ljt18-simplewebapp.herokuapp.com/
......
......@@ -2,4 +2,4 @@ build:
docker:
web: Dockerfile
run:
web: mvn package; sh target/bin/simplewebapp
web: mvn -Dmaven.test.skip=true package; sh target/bin/simplewebapp
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment