Skip to content

Reverts create container cmd regression. #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KostyaSha merged 1 commit into from
Jul 14, 2019
Merged

Reverts create container cmd regression. #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,20 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons

CreateContainerCmd withMacAddress(String macAddress);

@Deprecated
@CheckForNull
Long getMemory();

@Deprecated
CreateContainerCmd withMemory(Long memory);

@Deprecated
@CheckForNull
Long getMemorySwap();

@Deprecated
CreateContainerCmd withMemorySwap(Long memorySwap);

@CheckForNull
String getName();

Expand Down
31 changes: 31 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,37 @@ public CreateContainerCmd withMacAddress(String macAddress) {
return this;
}

@Deprecated
@Override
@JsonIgnore
public Long getMemory() {
return hostConfig.getMemory();
}

@Deprecated
@Override
public CreateContainerCmd withMemory(Long memory) {
checkNotNull(memory, "memory was not specified");
hostConfig.withMemory(memory);
return this;
}

@Deprecated
@Override
@JsonIgnore
public Long getMemorySwap() {
return hostConfig.getMemorySwap();
}

@Deprecated
@Override
public CreateContainerCmd withMemorySwap(Long memorySwap) {
checkNotNull(memorySwap, "memorySwap was not specified");
hostConfig.withMemorySwap(memorySwap);
return this;
}


@Override
public String getName() {
return name;
Expand Down