Skip to content

Commit 2821393

Browse files
ConnorLinfootConnorLinfoot
authored
Merge branch 'master' into master
2 parents 34cc4dc + 0047efc commit 2821393

170 files changed

Lines changed: 652 additions & 237 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Deploy with Maven
2222
env:
2323
MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
24-
run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY"
24+
run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests

‎docker-java-api/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,28 @@
4141
<version>1.18.18</version>
4242
<scope>provided</scope>
4343
</dependency>
44+
45+
46+
<dependency>
47+
<groupId>org.junit.jupiter</groupId>
48+
<artifactId>junit-jupiter</artifactId>
49+
<version>5.7.2</version>
50+
<scope>test</scope>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>com.tngtech.archunit</groupId>
55+
<artifactId>archunit-junit5</artifactId>
56+
<version>0.18.0</version>
57+
<scope>test</scope>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>com.tngtech.archunit</groupId>
62+
<artifactId>archunit</artifactId>
63+
<version>0.18.0</version>
64+
<scope>test</scope>
65+
</dependency>
4466
</dependencies>
4567

4668
<build>

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateConfigResponse {
13+
public class CreateConfigResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,13 @@ default CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
10061006
return this;
10071007
}
10081008

1009+
@CheckForNull
1010+
default String getPlatform() {
1011+
return null;
1012+
}
1013+
1014+
CreateContainerCmd withPlatform(String platform);
1015+
10091016
/**
10101017
* @throws NotFoundException No such container
10111018
* @throws ConflictException Named container already exists

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -11,7 +12,7 @@
1112
*/
1213
@EqualsAndHashCode
1314
@ToString
14-
public class CreateContainerResponse {
15+
public class CreateContainerResponse extends DockerObject {
1516

1617
@JsonProperty("Id")
1718
private String id;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -12,7 +13,7 @@
1213
*/
1314
@EqualsAndHashCode
1415
@ToString
15-
public class CreateImageResponse {
16+
public class CreateImageResponse extends DockerObject {
1617

1718
@JsonProperty("status")
1819
private String id;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
4747
/** Name of the network driver to use. Defaults to <code>bridge</code>. */
4848
CreateNetworkCmd withDriver(String driver);
4949

50-
/** Ipam config, such es subnet, gateway and ip range of the network */
50+
/** Ipam config, such as subnet, gateway and ip range of the network */
5151
CreateNetworkCmd withIpam(Ipam ipam);
5252

5353
/** Driver specific options */

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

78
@EqualsAndHashCode
89
@ToString
9-
public class CreateNetworkResponse {
10+
public class CreateNetworkResponse extends DockerObject {
1011

1112
@JsonProperty("Id")
1213
private String id;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateSecretResponse {
13+
public class CreateSecretResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateServiceResponse {
13+
public class CreateServiceResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

0 commit comments

Comments
 (0)