--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java Tue Mar 26 15:50:34 2019 -0400
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java Tue Mar 26 13:25:26 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@@ -126,11 +125,6 @@
if (Files.exists(buildDir)) {
throw new RuntimeException("The docker build directory already exists: " + buildDir);
}
- // check for the existance of a platform specific docker file as well
- String platformSpecificDockerfile = dockerfile + "-" + Platform.getOsArch();
- if (Files.exists(Paths.get(Utils.TEST_SRC, platformSpecificDockerfile))) {
- dockerfile = platformSpecificDockerfile;
- }
Path jdkSrcDir = Paths.get(Utils.TEST_JDK);
Path jdkDstDir = buildDir.resolve("jdk");
@@ -158,8 +152,9 @@
public static void
buildDockerImage(String imageName, Path dockerfile, Path buildDir) throws Exception {
- // Copy docker file to the build dir
- Files.copy(dockerfile, buildDir.resolve("Dockerfile"));
+ generateDockerFile(buildDir.resolve("Dockerfile"),
+ DockerfileConfig.getBaseImageName(),
+ DockerfileConfig.getBaseImageVersion());
// Build the docker
execute("docker", "build", "--no-cache", "--tag", imageName, buildDir.toString())
@@ -250,6 +245,18 @@
}
+ private static void generateDockerFile(Path dockerfile, String baseImage,
+ String baseImageVersion) throws Exception {
+ String template =
+ "FROM %s:%s\n" +
+ "COPY /jdk /jdk\n" +
+ "ENV JAVA_HOME=/jdk\n" +
+ "CMD [\"/bin/bash\"]\n";
+ String dockerFileStr = String.format(template, baseImage, baseImageVersion);
+ Files.writeString(dockerfile, dockerFileStr);
+ }
+
+
private static class CopyFileVisitor extends SimpleFileVisitor<Path> {
private final Path src;
private final Path dst;