Skip to content

Commit 7758de7

Browse files
ks-ci-botks-ci-bot
authored
Merge pull request #77 from chilianyi/jdk17
Add maven jdk17
2 parents df3a038 + a8c618b commit 7758de7

File tree

5 files changed

+98
-14
lines changed

5 files changed

+98
-14
lines changed

‎.github/workflows/build-podman.yaml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,26 @@ jobs:
132132
ghcr-token: ${{ secrets.GHCR_TOKEN }}
133133
build-args: "JDK_VERSION=11"
134134

135+
BuildMavenJDK17:
136+
needs: BuildBase
137+
runs-on: ubuntu-20.04
138+
steps:
139+
- uses: actions/checkout@v2
140+
- name: Build maven(JDK17) agent
141+
uses: ./.github/actions/build
142+
with:
143+
context: maven
144+
dockerfile: maven/podman/Dockerfile
145+
image-name: builder-maven
146+
tag-suffix: -jdk17-podman
147+
platforms: linux/amd64
148+
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
149+
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
150+
ghcr-token: ${{ secrets.GHCR_TOKEN }}
151+
build-args: |
152+
"JDK_VERSION=17"
153+
"JDK_HOME=/usr/java/default"
154+
135155
BuildGradle:
136156
needs: BuildBase
137157
runs-on: ubuntu-20.04
@@ -148,7 +168,7 @@ jobs:
148168
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
149169
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
150170
ghcr-token: ${{ secrets.GHCR_TOKEN }}
151-
171+
152172
BuildNodeJs:
153173
needs: BuildBase
154174
runs-on: ubuntu-20.04

‎.github/workflows/build.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,25 @@ jobs:
128128
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
129129
ghcr-token: ${{ secrets.GHCR_TOKEN }}
130130
build-args: "JDK_VERSION=11"
131+
BuildMavenJDK17:
132+
needs: BuildBase
133+
runs-on: ubuntu-20.04
134+
steps:
135+
- uses: actions/checkout@v2
136+
- name: Build maven(JDK17) agent
137+
uses: ./.github/actions/build
138+
with:
139+
context: maven
140+
dockerfile: maven/Dockerfile
141+
image-name: builder-maven
142+
tag-suffix: -jdk17
143+
platforms: linux/amd64,linux/arm64
144+
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
145+
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
146+
ghcr-token: ${{ secrets.GHCR_TOKEN }}
147+
build-args: |
148+
"JDK_VERSION=17"
149+
"JDK_HOME=/usr/java/default"
131150
132151
BuildGradle:
133152
needs: BuildBase
@@ -144,7 +163,7 @@ jobs:
144163
docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
145164
docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
146165
ghcr-token: ${{ secrets.GHCR_TOKEN }}
147-
166+
148167
BuildNodeJs:
149168
needs: BuildBase
150169
runs-on: ubuntu-20.04

‎Makefile‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,20 @@ build-maven-podman:
1111
push-maven-podman:
1212
docker push kubespheredev/builder-maven:$(VERSION)-podman
1313

14-
build-jdk11:
15-
docker build maven -f maven/Dockerfile -t kubespheredev/builder-maven:$(VERSION)-jdk11 --build-arg JDK_VERSION=11
14+
build-maven-jdk11:
15+
docker build maven -f maven/Dockerfile -t kubespheredev/builder-maven:$(VERSION)-jdk11 \
16+
--build-arg JDK_VERSION=11
17+
push-maven-jdk11:
18+
docker push kubespheredev/builder-maven:$(VERSION)-jdk11
19+
20+
build-maven-jdk17:
21+
docker build maven -f maven/Dockerfile -t kubespheredev/builder-maven:$(VERSION)-jdk17 \
22+
--build-arg JDK_VERSION=17 --build-arg JDK_HOME=/usr/java/default
23+
push-maven-jdk17:
24+
docker push kubespheredev/builder-maven:$(VERSION)-jdk17
25+
26+
build-maven-jdk17-podman:
27+
docker build maven -f maven/podman/Dockerfile -t kubespheredev/builder-maven:$(VERSION)-jdk17-podman \
28+
--build-arg JDK_VERSION=17 --build-arg JDK_HOME=/usr/java/default
29+
push-maven-jdk17-podman:
30+
docker push kubespheredev/builder-maven:$(VERSION)-jdk17-podman

‎maven/Dockerfile‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
FROM kubespheredev/builder-base:v3.1.0
22

33
ARG JDK_VERSION 1.8.0
4+
ARG JDK_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk
45

56
# java
6-
ENV JAVA_VERSIOIN $JDK_VERSION
7-
RUN yum install -y java-${JAVA_VERSIOIN}-openjdk-devel \
8-
java-${JAVA_VERSIOIN}-openjdk-devel.i686
7+
ENV JAVA_VERSION $JDK_VERSION
98

9+
RUN if [ "x${JAVA_VERSION}" = "x17" ]; then \
10+
ARCH= && uArch="$(uname -m)" \
11+
&& case "${uArch##*-}" in \
12+
x86_64) ARCH='x64';; \
13+
aarch64) ARCH='aarch64';; \
14+
*) echo "unsupported architecture"; exit 1 ;; \
15+
esac \
16+
&& wget https://download.oracle.com/java/${JAVA_VERSION}/latest/jdk-${JAVA_VERSION}_linux-${ARCH}_bin.rpm \
17+
&& rpm -ivh jdk-${JAVA_VERSION}_linux-${ARCH}_bin.rpm; \
18+
else \
19+
yum install -y java-${JAVA_VERSION}-openjdk-devel java-${JAVA_VERSION}-openjdk-devel.i686; \
20+
fi
1021
# maven
1122
ENV MAVEN_VERSION 3.5.3
1223
RUN curl -f -L https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar -C /opt -xzv
1324
ENV M2_HOME /opt/apache-maven-$MAVEN_VERSION
14-
ENV JAVA_HOME /usr/lib/jvm/java-${JAVA_VERSIOIN}-openjdk
25+
ENV JAVA_HOME $JDK_HOME
1526
ENV maven.home $M2_HOME
1627
ENV M2 $M2_HOME/bin
1728
ENV PATH $M2:$PATH:JAVA_HOME/bin
@@ -28,6 +39,10 @@ ENV PATH ${PATH}:/opt/ant/bin
2839

2940
# Set JDK to be 32bit
3041
COPY set_java $M2
31-
RUN $M2/set_java && rm $M2/set_java
42+
RUN if [ "x${JAVA_VERSION}" = "x17" ]; then \
43+
rm $M2/set_java; \
44+
else \
45+
$M2/set_java && rm $M2/set_java; \
46+
fi
3247

3348
CMD ["mvn","-version"]

‎maven/podman/Dockerfile‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
FROM kubespheredev/builder-base:v3.1.0-podman
22

33
ARG JDK_VERSION 1.8.0
4+
ARG JDK_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk
45

56
# java
6-
ENV JAVA_VERSIOIN $JDK_VERSION
7-
RUN yum install -y java-${JAVA_VERSIOIN}-openjdk-devel \
8-
java-${JAVA_VERSIOIN}-openjdk-devel.i686
7+
ENV JAVA_VERSION $JDK_VERSION
98

9+
RUN if [ "x${JAVA_VERSION}" = "x17" ]; then \
10+
ARCH= && uArch="$(uname -m)" \
11+
&& case "${uArch##*-}" in \
12+
x86_64) ARCH='x64';; \
13+
aarch64) ARCH='aarch64';; \
14+
*) echo "unsupported architecture"; exit 1 ;; \
15+
esac \
16+
&& wget https://download.oracle.com/java/${JAVA_VERSION}/latest/jdk-${JAVA_VERSION}_linux-${ARCH}_bin.rpm \
17+
&& rpm -ivh jdk-${JAVA_VERSION}_linux-${ARCH}_bin.rpm; \
18+
else \
19+
yum install -y java-${JAVA_VERSION}-openjdk-devel java-${JAVA_VERSION}-openjdk-devel.i686; \
20+
fi
1021
# maven
1122
ENV MAVEN_VERSION 3.5.3
1223
RUN curl -f -L https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar -C /opt -xzv
1324
ENV M2_HOME /opt/apache-maven-$MAVEN_VERSION
14-
ENV JAVA_HOME /usr/lib/jvm/java-${JAVA_VERSIOIN}-openjdk
25+
ENV JAVA_HOME $JDK_HOME
1526
ENV maven.home $M2_HOME
1627
ENV M2 $M2_HOME/bin
1728
ENV PATH $M2:$PATH:JAVA_HOME/bin
@@ -28,6 +39,10 @@ ENV PATH ${PATH}:/opt/ant/bin
2839

2940
# Set JDK to be 32bit
3041
COPY set_java $M2
31-
RUN $M2/set_java && rm $M2/set_java
42+
RUN if [ "x${JAVA_VERSION}" = "x17" ]; then \
43+
rm $M2/set_java; \
44+
else \
45+
$M2/set_java && rm $M2/set_java; \
46+
fi
3247

3348
CMD ["mvn","-version"]

0 commit comments

Comments
 (0)