merge: Merge with master

SwissTierrasColombia · Oct 8, 2020 · 9548f98 · 9548f98
2 parents a259847 + 0c244f9
commit 9548f98
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 37 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ ENV CLOUD_CONFIG=$CLOUD_CONFIG
 
 VOLUME /tmp
 
-ADD ./target/st-microservice-administration-0.0.1-SNAPSHOT.jar st-microservice-administration.jar
+ADD ./target/st-microservice-administration-1.1.2.jar st-microservice-administration.jar
 
 EXPOSE 8080
 

diff --git a/README.md b/README.md
@@ -53,40 +53,6 @@ spring:
 
 See [http://localhost:7986/swagger-ui.html](http://localhost:7986/swagger-ui.html)
 
-## Running Production
-
-### Master Branch
-
-Go to the master branch
-
-```sh
-$ git checkout master
-```
-
-### Generate jar
-
-```sh
-$ mvn clean package -DskipTests
-```
-
-### Create Network Docker
-
-```sh
-$ docker network create st
-```
-
-### Create image from Dockerfile
-
-```sh
-$ docker build -t st-microservice-administration:lynx .
-```
-
-### Run Container
-
-```sh
-$ docker run -P -t --network st -d st-microservice-administration:lynx
-```
-
 ## License
 
 [Agencia de Implementación - BSF Swissphoto - INCIGE](https://github.com/AgenciaImplementacion/st-microservice-administration/blob/master/LICENSE)
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
 	<groupId>com.ai.st.microservice.administration</groupId>
 	<artifactId>st-microservice-administration</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.1.2</version>
 	<name>st-microservice-administration2</name>
 	<description>Microservice Administration Users and Roles</description>
 

diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
@@ -2,7 +2,7 @@ spring:
   application:
     name: st-microservice-administration
   profiles:
-    active: "aws"
+    active: "production"
   cloud:
     config:
       enabled: true