diff --git a/CHANGELOG.md b/CHANGELOG.md index 34ec05838..400a91f24 100644 --- a/CHANGELOG.md +++ b/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-core/releases/tag/v7.3.0) 2022-12-18 + +* Add endpoint to allow health checks. + ## [[7.2.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.2.2) 2022-12-20 * Use `iexec-common` version [6.2.0](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v6.2.0). diff --git a/Dockerfile b/Dockerfile index 30fdc4d25..a3e5ec1e1 100644 --- a/Dockerfile +++ b/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-core.jar ENTRYPOINT ["java", "-jar", "/iexec-core.jar"] diff --git a/README.md b/README.md index 3cfef77f1..afe03609b 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ You can configure the _iExec Core Scheduler_ with the following properties: | `IEXEC_SMS_PROTOCOL` | _iExec SMS_ server communication protocol. | String | `http` | | `IEXEC_SMS_HOST` | _iExec SMS_ server host. | String | `localhost` | | `IEXEC_SMS_PORT` | _iExec SMS_ server port. | Positive integer | `13300` | -| `IEXEC_CORE_MANAGEMENT_PORT` | Management endpoint HTTP port (uses the same port as the application by default). Configure a different port to use management-specific SSL. | Positive integer | `13001` | | `IEXEC_CORE_MANAGEMENT_ACTUATORS` | Endpoint IDs that should be included or `*` for all. | String | `health, info` | | `IEXEC_CORE_GRAYLOG_HOST` | _Graylog_ server host. | String | `localhost` | | `IEXEC_CORE_GRAYLOG_PORT` | _Graylog_ server port. | Positive integer | `12201` | @@ -60,6 +59,12 @@ You can configure the _iExec Core Scheduler_ with the following properties: A more exhaustive documentation is available on [the official documentation of iExec](https://docs.iex.ec/). +## Health checks + +A health endpoint (`/actuator/health`) is enabled by default and can be accessed on the `IEXEC_CORE_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 ``` diff --git a/build.gradle b/build.gradle index 2c8b781d0..e05fb628b 100644 --- a/build.gradle +++ b/build.gradle @@ -59,15 +59,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-web" - implementation "org.springframework.boot:spring-boot-starter-data-mongodb" - implementation "org.springframework.boot:spring-boot-starter-websocket" - implementation "org.springframework.retry:spring-retry" + implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-aop" + implementation "org.springframework.boot:spring-boot-starter-data-mongodb" + implementation "org.springframework.boot:spring-boot-starter-hateoas" implementation "org.springframework.boot:spring-boot-starter-security" - implementation "org.springframework.boot:spring-boot-starter-actuator" + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-websocket" implementation "org.springframework.cloud:spring-cloud-starter-openfeign" - implementation "org.springframework.boot:spring-boot-starter-hateoas" + implementation "org.springframework.retry:spring-retry" // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)' // Spring Boot dependencies BOM enforces okhttp3 3.14.9 in 2.6.X diff --git a/gradle.properties b/gradle.properties index 94c7075dd..70668135b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -version=7.2.2 +version=7.3.0 iexecCommonVersion=6.2.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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 359498590..85c4d9c1c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -77,8 +77,6 @@ sms: port: ${IEXEC_SMS_PORT:13300} management: - server: - port: ${IEXEC_CORE_MANAGEMENT_PORT:13001} endpoints: web: exposure: