Skip to content

Commit

Permalink
Build java image directly
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentgo committed May 21, 2024
1 parent ebfb662 commit a35d6e0
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
maven: [3.9.6]
image: [java]
env:
JDK: 22
TEST_JDK: ${{ matrix.jdk }}
MAVEN: ${{ matrix.maven }}
steps:
Expand Down
64 changes: 64 additions & 0 deletions ci/maven-toolchains.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
<toolchain>
<type>jdk</type>
<provides>
<version>1.8</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA8_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>11</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA11_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>17</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA17_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>21</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA21_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>22</version>
<vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA22_HOME}</jdkHome>
</configuration>
</toolchain>
</toolchains>
12 changes: 9 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1711,9 +1711,15 @@ services:
# docker-compose build java
# docker-compose run java
# Parameters:
# MAVEN: 3.9.5
# JDK: 8, 11, 17, 21
image: ghcr.io/laurentgo/multi-jdk-maven-image:main
# JDK: 8, 11, 17, 21, 22
image: ${REPO}:${ARCH}-java
build:
args:
base: maven:3.9.6-eclipse-temurin-${JDK}
context: .
dockerfile: ci/docker/java.dockerfile
cache_from:
- ${REPO}:${ARCH}-java
shm_size: *shm-size
volumes: &java-volumes
- .:/arrow:delegated
Expand Down

0 comments on commit a35d6e0

Please sign in to comment.