add actuator & logs & docker-compose & healthcheck

Author: strautins

.gitignore

@@ -32,6 +32,7 @@ build/
 ### VS Code ###
 .vscode/
 
-
-### cert ###
-certs
+### custom ###
+certs
+*.log
+*.gz

README.md

@@ -52,10 +52,13 @@ _Changes alias_
 _You can allow use of https://127.0.0.1:8080/ping api from browser, if property set server.ssl.client-auth=want_
 
 _Run [cert.sh](./cert.sh) for generating localhost demo certificates_  
-_Run [docker.sh](./docker.sh) to create Docker image and run docker container_  
-_Run [run.sh](./run.sh) to create certs, prepare docker files, run docker_
+_Run [jar.sh](./jar.sh) to compile & extract .jar for docker image_  
+_Run [docker.sh](./docker.sh) to create Docker image and run docker container_   
+_Run: docker-compose.  
+`docker-compose -p test up --force-recreate --build`    
+Make sure cert __ext__ flag ip set correctly_  
 
-To change certs in container   
+To change certs in container     
 [docker run -v /host/path/to/certs:/container/path/to/certs -d IMAGE_ID "update-ca-certificates"](https://stackoverflow.com/questions/26028971/docker-container-ssl-certificates)
 
 

docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3.8"
+services:
+    testserver:
+        build:
+            context: ./
+            dockerfile: app.Dockerfile
+        restart: always
+        ports:
+            - "8080:8080/tcp"
+            - "8081:8081/tcp"
+        environment:
+            SERVER_ADDRESS: 0.0.0.0
+            SERVER_PORT: 8080
+            MANAGEMENT_PORT: 8081
+        healthcheck:
+          test: "curl --fail --silent localhost:8081/actuator/health | grep UP || exit 1"
+          interval: 20s
+          timeout: 5s
+          retries: 5
+          start_period: 40s

docker.conf

@@ -1,2 +1,3 @@
 EXT_IP=0.0.0.0
-PORT=8080
+PORT=8080
+MANAGEMENT_PORT=8081

docker.sh

@@ -3,5 +3,12 @@
 #https://spring.io/guides/gs/spring-boot-docker/
 
 docker build -f app.Dockerfile -t example/app:latest .
-
-winpty docker run -it --rm -e SERVER_PORT=8080 -e SERVER_ADDRESS="${EXT_IP}" -p "${PORT}":8080 --name testserver example/app
+#winpty for windows docker flag -i
+winpty docker run -it --rm \
+-e SERVER_ADDRESS="${EXT_IP}" \
+-e SERVER_PORT=8080 \
+-e MANAGEMENT_SERVER_PORT=8081 \
+-p "${MANAGEMENT_PORT}":8081 \
+-p "${PORT}":8080 \
+--name testserver \
+example/app

jar.sh

@@ -0,0 +1,6 @@
+#! /bin/bash
+mvn clean install
+mkdir target/dependency
+cd target/dependency || exit
+jar -xf ../*.jar
+cd ../../

pom.xml

@@ -21,6 +21,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-actuator</artifactId>
+			</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>

run.sh

@@ -1,12 +1,8 @@
 #! /bin/bash
 . ./docker.conf
-
+echo "Creating certs"
 bash cert.sh "san=ip:${EXT_IP}"
-
-mvn clean install
-mkdir target/dependency
-cd target/dependency || exit
-jar -xf ../*.jar
-cd ../../
-#create docker image and run container
+echo "Compiling and extracting jar"
+bash jar.sh
+echo "Creating docker image and running container"
 bash docker.sh

src/main/java/edu/strauteka/example/ExampleApplication.java

@@ -16,7 +16,5 @@ public static void main(String[] args) {
 			log.info("Starting exit...");
 			ctx.close();
 		}));
-
-
 	}
 }

src/main/resources/application.properties

@@ -31,4 +31,17 @@ spring.jmx.enabled=false
 
 #suspend debug
 logging.level.org.springframework.test.context=WARN
-logging.level.org.springframework.boot.test.context=WARN
+logging.level.org.springframework.boot.test.context=WARN
+
+
+#https://docs.spring.io/spring-boot/docs/current/reference/html/actuator.html
+management.endpoints.web.exposure.include=health,info,beans,logfile
+# /actuator without ssl
+management.server.port=8081
+management.server.ssl.enabled=false
+
+logging.level.web=debug
+logging.file.name=logfile.log
+logging.file.path=./
+logging.logback.rollingpolicy.max-history=5
+logging.logback.rollingpolicy.max-file-size=1MB