Merge pull request #31 from iExecBlockchainComputing/release/1.2.0

Release 1.2.0

CHANGELOG.md

@@ -2,30 +2,47 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[1.2.0]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.2.0) 2023-11-06
+
+### New Features
+
+- Add `HostConfig` member in `DockerRunRequest`, add related deprecations. (#28)
+- Add `executionDuration` member in `DockerRunResponse`. (#29)
+- Do less Docker API calls when stopping or removing containers or removing images. (#30)
+
 ## [[1.1.2]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.1.2) 2023-09-27
 
 ### Bug Fixes
+
 - Missed version update in `gradle.properties` in hotfix 1.1.1.
 
 ## [[1.1.1]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.1.1) 2023-09-27
 
 ### Bug Fixes
+
 - Revert PR #23, the official **SGX devices** coming with the **in-kernel SGX driver** since kernel 5.11
   are not yet supported in SGX enclaves based on the Gramine framework currently in use. (#25)
 
 ## [[1.1.0]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.1.0) 2023-09-26
 
 ### New Features
+
 - Move `ArgsUtils`, `SgxDriverMode` and `SgxUtils` classes from `iexec-common`. (#14)
+
 ### Bug Fixes
+
 - Add missing `lombok.config` file. (#15)
 - Use official `/dev/sgx_enclave` and `/dev/sgx_provision` devices. (#23)
+
 ### Quality
+
 - Replace deprecated `ExecStartResultCallback` with `ResultCallback.Adapter` in `DockerClientInstance`. (#17)
 - Upgrade to Gradle 8.2.1 with up-to-date plugins. (#19)
 - Properly handle `InterruptedException` instances in `DockerClientInstance`. (#20)
 - Several quality fixes (assertions, code smells, TODOs). (#21)
+
 ### Dependency Upgrades
+
 - Add `maven-shared-utils:3.4.2` dependency. (#14)
 - Remove `iexec-common` dependency. (#16)
 - Upgrade to Spring Boot 2.7.14. (#18)
@@ -34,14 +51,18 @@ All notable changes to this project will be documented in this file.
 ## [[1.0.3]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.0.3) 2023-06-23
 
 ### Dependency Upgrades
+
 - Upgrade to `iexec-common` 8.2.1. (#12)
 
 ## [[1.0.2]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.0.2) 2023-04-13
 
 ### Bug Fixes
+
 - Remove unused `@Tag` annotations in tests. (#8)
 - Remove `WaitUtils` usage. (#9)
+
 ### Dependency Upgrades
+
 - Upgrade to `iexec-common` 8.0.0. (#9)
 
 ## [[1.0.1]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.0.1) 2023-03-16

gradle.properties

@@ -1,4 +1,4 @@
-version=1.1.2
+version=1.2.0
 
 nexusUser
 nexusPassword

src/main/java/com/iexec/commons/containers/DockerRunRequest.java

@@ -17,6 +17,7 @@
 package com.iexec.commons.containers;
 
 import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.HostConfig;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,19 +34,27 @@
 @AllArgsConstructor
 public class DockerRunRequest {
 
+    @Builder.Default
+    private HostConfig hostConfig = HostConfig.newHostConfig();
     private String chainTaskId;
     private String containerName;
     private int containerPort;
     private String imageUri;
     private String entrypoint;
     private String cmd;
     private List<String> env;
+    /** @deprecated Use HostConfig instead */
+    @Deprecated(forRemoval = true)
     private List<String> binds;
     private long maxExecutionTime;
     private SgxDriverMode sgxDriverMode;
+    /** @deprecated Use HostConfig instead */
+    @Deprecated(forRemoval = true)
     private String dockerNetwork;
     private String workingDir;
     private boolean shouldDisplayLogs;
+    /** @deprecated Use HostConfig instead */
+    @Deprecated(forRemoval = true)
     private List<Device> devices;
 
     public String getStringArgsCmd() {
@@ -57,17 +66,17 @@ public String[] getArrayArgsCmd() {
     }
 
     /**
-     * Gets a copy of the binds list.
-     * @return A copy of defined binds or an empty list
+     * @deprecated Use new HostConfig field
      */
+    @Deprecated(forRemoval = true)
     public List<String> getBinds() {
         return binds != null ? new ArrayList<>(binds) : Collections.emptyList();
     }
 
     /**
-     * Gets a copy of the devices list.
-     * @return A copy of defined devices or an empty list
+     * @deprecated Use new HostConfig field
      */
+    @Deprecated(forRemoval = true)
     public List<Device> getDevices() {
         return devices != null ? new ArrayList<>(devices) : Collections.emptyList();
     }

src/main/java/com/iexec/commons/containers/DockerRunResponse.java

@@ -21,6 +21,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.Duration;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -30,6 +32,7 @@ public class DockerRunResponse {
     private DockerRunFinalStatus finalStatus;
     private DockerLogs dockerLogs;
     private int containerExitCode;
+    private Duration executionDuration;
 
     public boolean isSuccessful() {
         return finalStatus == DockerRunFinalStatus.SUCCESS;