Skip to content

Commit 092a5f7

Browse files
committed
[docker] Prevent JDK9/JDK10 container collision
1 parent 7046fad commit 092a5f7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ JShell JDI agent on the remote side, which is handled by SSH as well.
4545
2. Adjust the JAVA_VERSION variable in `build/config.sh` to match the current OpenJDK tip: [OpenJDK 9 updates](http://hg.openjdk.java.net/jdk-updates/jdk9u/)
4646
3. Build the jdk9 cross-compilation environment:
4747
```sh
48-
sudo docker build -t ev3dev-lang-java:jdk-stretch -f build/Dockerfile.system build
49-
sudo docker build -t ev3dev-lang-java:jdk-build -f build/Dockerfile.scripts build
48+
sudo docker build -t ev3dev-lang-java:jdk9-stretch -f build/Dockerfile.system build
49+
sudo docker build -t ev3dev-lang-java:jdk9-build -f build/Dockerfile.scripts build
5050
```
5151
4. Run the newly prepared container. You have to mount a host directory to the the `/build` directory in the container,
5252
otherwise the build would get discarded. The final build needs at least 6.5 GB of free space (in the build directory).
5353
```
54-
sudo docker run --rm -it -v <path on host, where the sources should be stored>:/build ev3dev-lang-java:jdk-build
54+
sudo docker run --rm -it -v <path on host, where the sources should be stored>:/build ev3dev-lang-java:jdk9-build
5555
```
5656
5. Let's fetch the OpenJDK sources:
5757
```

build/Dockerfile.scripts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ev3dev-lang-java:jdk-stretch
1+
FROM ev3dev-lang-java:jdk9-stretch
22

33
# copy build patches & scripts
44
COPY *.patch *.sh /opt/jdkcross/

0 commit comments

Comments
 (0)