BSC/todo-service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: BSC:main
Branches Tags
BSC:main
BSC:editFeature
BSC:noEdit
...
pull from: BSC:noEdit
Branches Tags
BSC:editFeature
BSC:main
BSC:noEdit

2 Commits
main ... noEdit

Author SHA1 Message Date
dergeorg
e2360c69c6 no edit 2022-05-07 01:52:16 +02:00
dergeorg
7a760ae97d No Edit 2022-05-01 23:12:40 +02:00
2 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -25,6 +25,11 @@ variables:
build-job: # Building jar file build-job: # Building jar file
image: maven:3.6.3-jdk-11-slim image: maven:3.6.3-jdk-11-slim
stage: build stage: build
variables:
MAVEN_OPTS: "-Dmaven.repo.local=${CI_PROJECT_DIR}/.repository/"
cache:
key: maven
paths: [.repository/]
script: script:
- mvn clean install -DskipTests && mvn package -B -e -DskipTests - mvn clean install -DskipTests && mvn package -B -e -DskipTests
- export - export
@ -39,7 +44,7 @@ publish-job: # Building docker image and publishing it
- docker:dind - docker:dind
script: script:
- docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW
- docker build -t $DOCKER_URL/$TAG_LATEST . - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST .
- docker push $DOCKER_URL/$TAG_LATEST - docker push $DOCKER_URL/$TAG_LATEST
deploy-job: # Deploy docker image on ssh server deploy-job: # Deploy docker image on ssh server
@ -59,4 +64,4 @@ deploy-job: # Deploy docker image on ssh server
- ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW" - ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW"
- ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST" - ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST"
- ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true" - ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true"
- ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e PROJEKTNAME_UNIQUE='$Project_name:$CI_JOB_ID' -e PROJEKTNAME='$Project_name' -e HOSTNAME=$EUREKA_HOSTNAME -e EUREKAPORT=$EUREKA_PORT -e server.port=$CONFIG_PORT -e CONFIGPORT=$CONFIG_PORT -e KEY='$CONFIG_KEY' -e CONFIGURL='$CONFIG_URL' -e CONFIGUSER='$CONFIG_USER' -e CONFIGHTTP=$CONFIG_HTTP -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST" - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e spring.config.import='configserver:$CONFIG_HTTP://$CONFIG_USER$CONFIG_URL/todo-config' -e PROJEKTNAME_UNIQUE='$Project_name:$CI_JOB_ID' -e PROJEKTNAME='$Project_name' -e HOSTNAME=$EUREKA_HOSTNAME -e EUREKAPORT=$EUREKA_PORT -e server.port=$PORT_CONTAINER -e CONFIGPORT=$CONFIG_PORT -e KEY='$CONFIG_KEY' -e CONFIGURL='$CONFIG_URL' -e CONFIGUSER='$CONFIG_USER' -e CONFIGHTTP=$CONFIG_HTTP -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"

1
src/main/java/at/dergeorg/todoservice/controller/restController.java
View File

@ -15,7 +15,6 @@ import java.util.Optional;
@CrossOrigin(value = "*") @CrossOrigin(value = "*")
public class restController { public class restController {
@Autowired
private TodoRepo repo; private TodoRepo repo;
@GetMapping("/todo/{id}") @GetMapping("/todo/{id}")