Skip to content

[FLINK-36392] Build with target jdk #888

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 7, 2024
Merged

[FLINK-36392] Build with target jdk #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec21d48
[FlINK-36392] build and run using the targeted jre
SamBarker Sep 27, 2024
20e7fad
[FlINK-36392] Only run the jobs on push to main or release-*
SamBarker Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
name: Flink Kubernetes Operator CI
on:
push:
branches:
- main
- release-*
Comment on lines +26 to +28
Copy link
Contributor Author

@SamBarker SamBarker Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not strictly needed for this PR, but reduces the number of build jobs to wade through (especially useful when debugging). Happy to drop/move to a new PR if desired.

pull_request:
jobs:
test_ci:
Expand Down Expand Up @@ -163,7 +166,8 @@ jobs:
export SHELL=/bin/bash
export DOCKER_BUILDKIT=1
eval $(minikube -p minikube docker-env)
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain .
export JAVA_VERSION=${{ matrix.java-version }}
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain --build-arg JAVA_VERSION="${JAVA_VERSION:-11}" .
docker images
- name: Start the operator
run: |
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# limitations under the License.
################################################################################
# Build
FROM maven:3.8.4-eclipse-temurin-11 AS build
ARG JAVA_VERSION=11
FROM maven:3.8.8-eclipse-temurin-${JAVA_VERSION} AS build
Copy link
Contributor Author

@SamBarker SamBarker Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumps the maven version. I went for the oldest version which supports all three of the desired java versions. Could equally jump to the latest maven version (3.9.9 IIRC).

This is the core of the fix so that maven in the docker container actually builds with the desired JVM version.

ARG SKIP_TESTS=true

WORKDIR /app
Expand All @@ -33,7 +34,7 @@ RUN cd /app/tools/license; mkdir jars; cd jars; \
cd ../ && ./collect_license_files.sh ./jars ./licenses-output

# stage
FROM eclipse-temurin:11-jre-jammy
FROM eclipse-temurin:${JAVA_VERSION}-jre-jammy
ENV FLINK_HOME=/opt/flink
ENV FLINK_PLUGINS_DIR=$FLINK_HOME/plugins
ENV OPERATOR_VERSION=1.10-SNAPSHOT
Expand Down
Loading