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.

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

Add ojdkbuild 10 builds #200

Merged
merged 1 commit into from
Jun 5, 2018
Merged

Add ojdkbuild 10 builds #200

merged 1 commit into from
Jun 5, 2018

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 5, 2018

@tianon
Copy link
Member Author

tianon commented Jun 5, 2018

$ GIT_PAGER=cat git log -p --find-copies-harder infosiftr/win10...docker-library/master
commit f45f3f269d4b515201f290360b345790663e657e (infosiftr/win10)
Author: Tianon Gravi <[email protected]>
Date:   Tue Jun 5 10:30:44 2018 -0700

    Add ojdkbuild 10 builds

diff --git a/.appveyor.yml b/.appveyor.yml
index 37e81f6..71d04b2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,10 @@ image: Visual Studio 2017
 
 environment:
   matrix:
+    - version: 10
+      variant: windowsservercore-ltsc2016
+    - version: 10
+      variant: nanoserver-sac2016
     - version: 8
       variant: windowsservercore-ltsc2016
     - version: 8
diff --git a/8/jdk/windows/nanoserver-sac2016/Dockerfile b/10/jdk/windows/nanoserver-sac2016/Dockerfile
similarity index 91%
copy from 8/jdk/windows/nanoserver-sac2016/Dockerfile
copy to 10/jdk/windows/nanoserver-sac2016/Dockerfile
index 6d03853..4b6731c 100644
--- a/8/jdk/windows/nanoserver-sac2016/Dockerfile
+++ b/10/jdk/windows/nanoserver-sac2016/Dockerfile
@@ -23,10 +23,10 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath;
 
 # https://github.com/ojdkbuild/ojdkbuild/releases
-ENV JAVA_VERSION 8u171
-ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1
-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip
-ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9
+ENV JAVA_VERSION 10.0.1
+ENV JAVA_OJDKBUILD_VERSION 10.0.1-1
+ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.1-1.b10.ojdkbuild.windows.x86_64.zip
+ENV JAVA_OJDKBUILD_SHA256 64664f2e28db55022d90beefd097779c59f843cacf1afeed8a7456ee64c603f1
 
 RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \
 	Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/8/jdk/windows/windowsservercore-1709/Dockerfile b/10/jdk/windows/windowsservercore-1709/Dockerfile
similarity index 86%
copy from 8/jdk/windows/windowsservercore-1709/Dockerfile
copy to 10/jdk/windows/windowsservercore-1709/Dockerfile
index 301a4cf..01d0bff 100644
--- a/8/jdk/windows/windowsservercore-1709/Dockerfile
+++ b/10/jdk/windows/windowsservercore-1709/Dockerfile
@@ -10,10 +10,10 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath;
 
 # https://github.com/ojdkbuild/ojdkbuild/releases
-ENV JAVA_VERSION 8u171
-ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1
-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip
-ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9
+ENV JAVA_VERSION 10.0.1
+ENV JAVA_OJDKBUILD_VERSION 10.0.1-1
+ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.1-1.b10.ojdkbuild.windows.x86_64.zip
+ENV JAVA_OJDKBUILD_SHA256 64664f2e28db55022d90beefd097779c59f843cacf1afeed8a7456ee64c603f1
 
 RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \
 	Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile b/10/jdk/windows/windowsservercore-ltsc2016/Dockerfile
similarity index 86%
copy from 8/jdk/windows/windowsservercore-ltsc2016/Dockerfile
copy to 10/jdk/windows/windowsservercore-ltsc2016/Dockerfile
index 2067fb5..7247031 100644
--- a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile
+++ b/10/jdk/windows/windowsservercore-ltsc2016/Dockerfile
@@ -10,10 +10,10 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath;
 
 # https://github.com/ojdkbuild/ojdkbuild/releases
-ENV JAVA_VERSION 8u171
-ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1
-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip
-ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9
+ENV JAVA_VERSION 10.0.1
+ENV JAVA_OJDKBUILD_VERSION 10.0.1-1
+ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.1-1.b10.ojdkbuild.windows.x86_64.zip
+ENV JAVA_OJDKBUILD_SHA256 64664f2e28db55022d90beefd097779c59f843cacf1afeed8a7456ee64c603f1
 
 RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \
 	Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/update.sh b/update.sh
index 739fd1b..d79ae71 100755
--- a/update.sh
+++ b/update.sh
@@ -409,8 +409,8 @@ EOD
 			elif [[ "$ojdkbuildVersion" == 1.* ]]; then
 				# convert "1.8.0.111-3" into "8u111"
 				ojdkJavaVersion="$(echo "$ojdkbuildVersion" | cut -d. -f2,4 | cut -d- -f1 | tr . u)"
-			elif [[ "$ojdkbuildVersion" == 9.* ]]; then
-				# convert "9.0.1-1.b01" into "9.0.1"
+			elif [[ "$ojdkbuildVersion" == 10.* ]]; then
+				# convert "10.0.1-1.b10" into "10.0.1"
 				ojdkJavaVersion="${ojdkbuildVersion%%-*}"
 			else
 				echo >&2 "error: unable to parse ojdkbuild version $ojdkbuildVersion"

@tianon tianon merged commit 4016bc1 into docker-library:master Jun 5, 2018
@tianon tianon deleted the win10 branch June 5, 2018 19:05
tianon added a commit to infosiftr/stackbrew that referenced this pull request Jun 5, 2018
- `bash`: 4.4.23
- `ghost`: 1.23.1
- `julia`: 0.6.3
- `matomo`: GPG race conditions (matomo-org/docker#105)
- `memcached`: `extstore` (docker-library/memcached#38)
- `mongo`: 4.0.0~rc2
- `openjdk`: remove 9 (docker-library/openjdk#199), add 10 for Windows (docker-library/openjdk#200), 11-ea+16
- `owncloud`: update PECL exts (docker-library/owncloud#102)
- `percona`: 5.7.22, 5.6.40
- `php`: fix `wget: error getting response: Connection reset by peer`
- `piwik`: GPG race conditions (matomo-org/docker#105)
- `python`: add `nis` nonsense to 2.7 (docker-library/python#281), 3.7.0b5
- `rocket.chat`: 0.65.1
- `ruby`: 2.6.0-preview2
- `wordpress`: update GPG for wp-cli
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant