diff --git a/Jenkinsfile b/Jenkinsfile index 759cf45..82ba207 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ node('master'){ stage('git') { - git branch: 'developer', credentialsId: '4b557b80-6257-46a3-9072-bb07ba228cff', url: 'ssh://_git@phabricator.release11.com/source/mockedservices.git' + git branch: 'developer', credentialsId: '4b557b80-6257-46a3-9072-bb07ba228cff', url: '_gitea@gitea.release11.com:R11/mockedservices.git' } stage('deploy'){ sh 'docker-compose --context gordon down' diff --git a/README.md b/README.md index 501fa7b..9abd3e8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # R11-MockedServices Mockup service for middleware testing. -[comment]: <> ([![Build Status](https://travis-ci.com/Szakalakamaka/Klaus.svg?token=Tt3QbF7q4wiFNnCGkuew&branch=master)](https://travis-ci.com/Szakalakamaka/Klaus)) - Available scripts: ### Running the application on a local machine @@ -47,47 +45,4 @@ Display elements from the list. Display list length. ###### SMEMBERS key Display elements from hashSet. -Logs can be found in lists with names logstash_yyyy-mm-dd. - -### Deployment and building with docker and jenkins -For creating docker context (feature available from docker version 19.03) run the command -#### docker context create -as shown by examples below. - -``` -docker context create DEV \ - --description "context for DEV environment" \ - --docker "host=ssh://jenkins@s5000xvn:22" -``` - -``` -docker context create PROD \ - --description "connection to PROD environment" \ - --docker "host=ssh://jenkins@server361209.nazwa.pl:22" - ``` - -``` -docker context create PROD \ - --description "context for PROD environment" \ - --docker "host=ssh://jenkins@server361209:22" -``` - -However it is highly adviseable to deploy service via Jenkins tool at jenkins.zipper.release11.com, where contexts have been already configured. - -#### docker-compose up -d --build -Builds and launches Redis service and the application. Performs unit testing on the code and run the applicationon on localhost. - -#### docker-compose --context DEV up --build -d -The same as above, but the application will be deployed on the server defined via docker context as DEV. - -#### docker-compose --context PROD up --build -d -The same as above, but the application will be deployed on the server defined via docker context as PROD. - -The application can be started on a local machine without environment support. - -Once a docker image repository will be availabe, the proper deployment order should be under control by docker-compose script -which should check if the applications are present and if not deploy stable images of Spring Cloud applications from -docker image repo. - - - +Logs can be found in lists with names logstash_yyyy-mm-dd. \ No newline at end of file diff --git a/src/main/java/com/release11/klaus/KlausApplication.java b/src/main/java/com/release11/klaus/KlausApplication.java index 25eb996..cfebdc7 100644 --- a/src/main/java/com/release11/klaus/KlausApplication.java +++ b/src/main/java/com/release11/klaus/KlausApplication.java @@ -3,7 +3,6 @@ package com.release11.klaus; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - /** * It's generic Spring context starter. Move along... *