test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java

*** 54,64 ****
      // diagnostic information.
      private static final int MAX_LINES_TO_COPY_FOR_CHILD_STDOUT = 100;
  
      // Use this property to specify docker location on your system.
      // E.g.: "/usr/local/bin/docker".
!     private static final String DOCKER_COMMAND =
          System.getProperty("jdk.test.docker.command", "docker");
  
      // Set this property to true to retain image after test. By default
      // images are removed after test execution completes.
      // Retaining the image can be useful for diagnostics and image inspection.
--- 54,64 ----
      // diagnostic information.
      private static final int MAX_LINES_TO_COPY_FOR_CHILD_STDOUT = 100;
  
      // Use this property to specify docker location on your system.
      // E.g.: "/usr/local/bin/docker".
!     public static final String DOCKER_COMMAND =
          System.getProperty("jdk.test.docker.command", "docker");
  
      // Set this property to true to retain image after test. By default
      // images are removed after test execution completes.
      // Retaining the image can be useful for diagnostics and image inspection.
*** 192,202 ****
  
  
      /**
       * Build the docker command to run java inside a container
       *
!      * @param DockerRunOptions optins for running docker
       *
       * @return command
       * @throws Exception
       */
      public static List<String> buildJavaCommand(DockerRunOptions opts) throws Exception {
--- 192,202 ----
  
  
      /**
       * Build the docker command to run java inside a container
       *
!      * @param DockerRunOptions options for running docker
       *
       * @return command
       * @throws Exception
       */
      public static List<String> buildJavaCommand(DockerRunOptions opts) throws Exception {
*** 223,235 ****
  
          return cmd;
      }
  
      /**
!      * Run Java inside the docker image with specified parameters and options.
       *
!      * @param DockerRunOptions optins for running docker
       *
       * @return output of the run command
       * @throws Exception
       */
      public static OutputAnalyzer dockerRunJava(DockerRunOptions opts) throws Exception {
--- 223,235 ----
  
          return cmd;
      }
  
      /**
!      * Run Java inside a docker container with specified parameters and options.
       *
!      * @param DockerRunOptions options for running docker
       *
       * @return output of the run command
       * @throws Exception
       */
      public static OutputAnalyzer dockerRunJava(DockerRunOptions opts) throws Exception {
*** 238,248 ****
  
  
       /**
       * Remove docker image
       *
!      * @param DockerRunOptions optins for running docker
       * @throws Exception
       */
      public static void removeDockerImage(String imageNameAndTag) throws Exception {
              execute(DOCKER_COMMAND, "rmi", "--force", imageNameAndTag);
      }
--- 238,248 ----
  
  
       /**
       * Remove docker image
       *
!      * @param DockerRunOptions options for running docker
       * @throws Exception
       */
      public static void removeDockerImage(String imageNameAndTag) throws Exception {
              execute(DOCKER_COMMAND, "rmi", "--force", imageNameAndTag);
      }