Merge branch 'release/7.3.0'

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[7.3.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v7.3.0) 2022-12-18
+
+* Add endpoint to allow health checks.
+
 ## [[7.2.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v7.2.0) 2022-12-09
 
 * To conform to Task Feedback API, return a `PostComputeResponse` at the end of the post-compute stage of a standard task.

Dockerfile

@@ -4,6 +4,10 @@ ARG jar
 
 RUN test -n "$jar"
 
+RUN apt-get update \
+    && apt-get install -y curl \
+    && rm -rf /var/lib/apt/lists/*
+
 COPY $jar iexec-worker.jar
 
 ENTRYPOINT [ "/bin/sh", "-c", "exec java -Djava.security.egd=file:/dev/./urandom -jar iexec-worker.jar" ]

README.md

@@ -46,6 +46,12 @@ You can configure the _iExec Worker_ with the following properties:
 | `IEXEC_CORE_GRAYLOG_PORT` | Graylog server port. | Positive integer | `12201` |
 | `IEXEC_WORKER_SGX_DRIVER_MODE` | Intel® SGX driver that should be used. | { NONE, LEGACY, NATIVE } | `NONE` |
 
+## Health checks
+
+A health endpoint (`/actuator/health`) is enabled by default and can be accessed on the `IEXEC_WORKER_PORT`.
+This endpoint allows to define health checks in an orchestrator or a [compose file](https://github.com/compose-spec/compose-spec/blob/master/spec.md#healthcheck).
+No default strategy has been implemented in the [Dockerfile](Dockerfile) at the moment.
+
 ## Build from sources
 
 *Please first update your config located in `./src/main/resources/application.yml`*

build.gradle

@@ -69,15 +69,15 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter") {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' //required for Graylog
     }
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-websocket"
-    implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation  "org.springframework.cloud:spring-cloud-starter"
     implementation  "org.springframework.cloud:spring-cloud-starter-openfeign"
     implementation  "org.springframework.retry:spring-retry"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.mockito:mockito-inline:4.8.0" // activates mocking final classes/methods
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     // Web3j issues, see core build.gradle
     implementation 'com.squareup.okhttp3:okhttp:4.3.1'

gradle.properties

@@ -1,8 +1,8 @@
-version=7.2.0
+version=7.3.0
 iexecCommonVersion=6.1.0
-iexecBlockchainAdapterVersion=7.1.1
-iexecResultVersion=7.1.0
-iexecSmsVersion=7.1.0
+iexecBlockchainAdapterVersion=7.3.0
+iexecResultVersion=7.3.0
+iexecSmsVersion=7.3.0
 
 nexusUser
 nexusPassword