Skip to content
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

Jump to bottom

Revert breaking binary change of CreateContainerCmd #1225

Merged
merged 2 commits into from
Jul 22, 2019
Merged

Revert breaking binary change of CreateContainerCmd #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
783972f
Revert breaking binary change of `CreateContainerCmd`.
bsideup Jul 21, 2019
62beea4
Fix leftovers
bsideup Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,32 @@
</instructions>
</configuration>
</plugin>

<plugin>
<!-- use with "mvn -DskipTests clean package japicmp:cmp" -->
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.14.1</version>
<configuration>
<oldVersion>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>3.1.0-rc-4</version>
<type>jar</type>
</dependency>
</oldVersion>
<newVersion>
<file>
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
</file>
</newVersion>
<parameter>
<accessModifier>public</accessModifier>
<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
</parameter>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
159 changes: 159 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 @@ -5,12 +5,17 @@
import com.github.dockerjava.api.model.AuthConfig;
import com.github.dockerjava.api.model.Bind;
import com.github.dockerjava.api.model.Capability;
import com.github.dockerjava.api.model.Device;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.HealthCheck;
import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.Link;
import com.github.dockerjava.api.model.LogConfig;
import com.github.dockerjava.api.model.LxcConf;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.RestartPolicy;
import com.github.dockerjava.api.model.Ulimit;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.VolumesFrom;

Expand Down Expand Up @@ -366,6 +371,160 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons

CreateContainerCmd withHostConfig(HostConfig hostConfig);

// The following methods are deprecated and should be set on {@link #getHostConfig()} instead.
// TODO remove in the next big release

@Deprecated
@CheckForNull
Integer getBlkioWeight();

@CheckForNull
@Deprecated
String getCgroupParent();

@Deprecated
@CheckForNull
Integer getCpuPeriod();

@Deprecated
@CheckForNull
Integer getCpuShares();

@Deprecated
@CheckForNull
String getCpusetCpus();

@Deprecated
@CheckForNull
String getCpusetMems();

@Deprecated
@CheckForNull
Device[] getDevices();

@Deprecated
@CheckForNull
String[] getDns();

@Deprecated
@CheckForNull
String[] getDnsSearch();

@Deprecated
@CheckForNull
LogConfig getLogConfig();

@Deprecated
@CheckForNull
LxcConf[] getLxcConf();

@Deprecated
@CheckForNull
Boolean getOomKillDisable();

@Deprecated
@CheckForNull
String getPidMode();

@Deprecated
@CheckForNull
Boolean getReadonlyRootfs();

@Deprecated
@CheckForNull
RestartPolicy getRestartPolicy();

@Deprecated
@CheckForNull
Ulimit[] getUlimits();

@Deprecated
CreateContainerCmd withBlkioWeight(Integer blkioWeight);

@Deprecated
CreateContainerCmd withCgroupParent(String cgroupParent);

@Deprecated
CreateContainerCmd withContainerIDFile(String containerIDFile);

@Deprecated
CreateContainerCmd withCpuPeriod(Integer cpuPeriod);

@Deprecated
CreateContainerCmd withCpuShares(Integer cpuShares);

@Deprecated
CreateContainerCmd withCpusetCpus(String cpusetCpus);

@Deprecated
CreateContainerCmd withCpusetMems(String cpusetMems);

@Deprecated
CreateContainerCmd withDevices(Device... devices);

/**
* Add host devices to the container
*/
@Deprecated
CreateContainerCmd withDevices(List<Device> devices);

/**
* Set custom DNS servers
*/
@Deprecated
CreateContainerCmd withDns(String... dns);

/**
* Set custom DNS servers
*/
@Deprecated
CreateContainerCmd withDns(List<String> dns);

/**
* Set custom DNS search domains
*/
@Deprecated
CreateContainerCmd withDnsSearch(String... dnsSearch);

/**
* Set custom DNS search domains
*/
@Deprecated
CreateContainerCmd withDnsSearch(List<String> dnsSearch);

@Deprecated
CreateContainerCmd withLogConfig(LogConfig logConfig);

@Deprecated
CreateContainerCmd withLxcConf(LxcConf... lxcConf);

@Deprecated
CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);

@Deprecated
CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);

/**
* Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
*/
@Deprecated
CreateContainerCmd withPidMode(String pidMode);

@Deprecated
CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);

/**
* Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
*/
@Deprecated
CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);

@Deprecated
CreateContainerCmd withUlimits(Ulimit... ulimits);

@Deprecated
CreateContainerCmd withUlimits(List<Ulimit> ulimits);

/**
* @throws NotFoundException No such container
* @throws ConflictException Named container already exists
Expand Down