Skip to content

Add some missed options to UpdateContainerCmd #2389

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
merged 5 commits into from
Apr 1, 2025
Merged

Add some missed options to UpdateContainerCmd #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b37bdc
Add some missed options to UpdateContainerCmd
MillQK Mar 26, 2025
a6ca6af
Delete old cpuPeriod and cpuQuota functions
MillQK Mar 26, 2025
b8f3051
Add update container response tests
MillQK Mar 27, 2025
463b1ca
Merge branch 'main' into update-container-command-improvements
MillQK Apr 1, 2025
52718bf
Merge branch 'main' into update-container-command-improvements
eddumelendez Apr 1, 2025
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
5 changes: 4 additions & 1 deletion docker-java-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@
<configuration>
<parameter>
<excludes>
<!-- Breaking change -->
<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#getCpuPeriod()</exclude>
<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#withCpuPeriod(java.lang.Integer)</exclude>
<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#getCpuQuota()</exclude>
<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#withCpuQuota(java.lang.Integer)</exclude>
<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs()</exclude>
<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw()</exclude>
</excludes>
Expand Down
97 changes: 92 additions & 5 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package com.github.dockerjava.api.command;

import com.github.dockerjava.api.model.BlkioRateDevice;
import com.github.dockerjava.api.model.BlkioWeightDevice;
import com.github.dockerjava.api.model.Device;
import com.github.dockerjava.api.model.DeviceRequest;
import com.github.dockerjava.api.model.RestartPolicy;
import com.github.dockerjava.api.model.Ulimit;
import com.github.dockerjava.api.model.UpdateContainerResponse;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.util.List;

/**
* @author Kanstantsin Shautsou
Expand All @@ -13,22 +20,47 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
@CheckForNull
String getContainerId();

UpdateContainerCmd withContainerId(@Nonnull String containerId);

@CheckForNull
Integer getBlkioWeight();

UpdateContainerCmd withBlkioWeight(Integer blkioWeight);

UpdateContainerCmd withContainerId(@Nonnull String containerId);
@CheckForNull
List<BlkioWeightDevice> getBlkioWeightDevice();

UpdateContainerCmd withBlkioWeightDevice(List<BlkioWeightDevice> blkioWeightDevice);

@CheckForNull
Integer getCpuPeriod();
List<BlkioRateDevice> getBlkioDeviceReadBps();

UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
UpdateContainerCmd withBlkioDeviceReadBps(List<BlkioRateDevice> blkioDeviceReadBps);

@CheckForNull
Integer getCpuQuota();
List<BlkioRateDevice> getBlkioDeviceWriteBps();

UpdateContainerCmd withCpuQuota(Integer cpuQuota);
UpdateContainerCmd withBlkioDeviceWriteBps(List<BlkioRateDevice> blkioDeviceWriteBps);

@CheckForNull
List<BlkioRateDevice> getBlkioDeviceReadIOps();

UpdateContainerCmd withBlkioDeviceReadIOps(List<BlkioRateDevice> blkioDeviceReadIOps);

@CheckForNull
List<BlkioRateDevice> getBlkioDeviceWriteIOps();

UpdateContainerCmd withBlkioDeviceWriteIOps(List<BlkioRateDevice> blkioDeviceWriteIOps);

@CheckForNull
Long getCpuPeriod();

UpdateContainerCmd withCpuPeriod(Long cpuPeriod);

@CheckForNull
Long getCpuQuota();

UpdateContainerCmd withCpuQuota(Long cpuQuota);

@CheckForNull
String getCpusetCpus();
Expand All @@ -45,6 +77,31 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons

UpdateContainerCmd withCpuShares(Integer cpuShares);

@CheckForNull
Long getCpuRealtimePeriod();

UpdateContainerCmd withCpuRealtimePeriod(Long cpuRealtimePeriod);

@CheckForNull
Long getCpuRealtimeRuntime();

UpdateContainerCmd withCpuRealtimeRuntime(Long cpuRealtimeRuntime);

@CheckForNull
List<Device> getDevices();

UpdateContainerCmd withDevices(List<Device> devices);

@CheckForNull
List<String> getDeviceCgroupRules();

UpdateContainerCmd withDeviceCgroupRules(List<String> deviceCgroupRules);

@CheckForNull
List<DeviceRequest> getDeviceRequests();

UpdateContainerCmd withDeviceRequests(List<DeviceRequest> deviceRequests);

@CheckForNull
Long getKernelMemory();

Expand All @@ -65,6 +122,36 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons

UpdateContainerCmd withMemorySwap(Long memorySwap);

@CheckForNull
Long getNanoCPUs();

UpdateContainerCmd withNanoCPUs(Long nanoCPUs);

@CheckForNull
Boolean getOomKillDisable();

UpdateContainerCmd withOomKillDisable(Boolean oomKillDisable);

@CheckForNull
Boolean getInit();

UpdateContainerCmd withInit(Boolean init);

@CheckForNull
Long getPidsLimit();

UpdateContainerCmd withPidsLimit(Long pidsLimit);

@CheckForNull
List<Ulimit> getUlimits();

UpdateContainerCmd withUlimits(List<Ulimit> ulimits);

@CheckForNull
RestartPolicy getRestartPolicy();

UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);

interface Exec extends DockerCmdSyncExec<UpdateContainerCmd, UpdateContainerResponse> {
}
}
Loading