Skip to content

Commit b241cda

Browse files
committed
[FlINK-36392] build and run using the targeted jre
1 parent b3b45ba commit b241cda

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ jobs:
163163
export SHELL=/bin/bash
164164
export DOCKER_BUILDKIT=1
165165
eval $(minikube -p minikube docker-env)
166-
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain .
166+
JAVA_VERSION=${{ matrix.java-version }}
167+
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-${{ matrix.java-version }}-latest --progress plain -- -build-arg JAVA_VERSION="${JAVA_VERSION:-11}" .
167168
docker images
168169
- name: Start the operator
169170
run: |
@@ -172,7 +173,7 @@ jobs:
172173
sed -i "s/# kubernetes.operator.leader-election.lease-name: flink-operator-lease/kubernetes.operator.leader-election.lease-name: flink-operator-lease/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
173174
sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
174175
fi
175-
helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ matrix.extraArgs }}
176+
helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-${{ matrix.java-version }}-latest ${{ matrix.extraArgs }}
176177
kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.namespace }} deploy/flink-kubernetes-operator
177178
kubectl get pods -n ${{ matrix.namespace }}
178179
- name: Run Flink e2e tests

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
# limitations under the License.
1717
################################################################################
1818
# Build
19-
FROM maven:3.8.4-eclipse-temurin-11 AS build
19+
ARG JAVA_VERSION=11
20+
FROM maven:3.8.4-eclipse-temurin-${JAVA_VERSION} AS build
2021
ARG SKIP_TESTS=true
2122

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

3536
# stage
36-
FROM eclipse-temurin:11-jre-jammy
37+
FROM eclipse-temurin:${JAVA_VERSION}-jre-jammy
3738
ENV FLINK_HOME=/opt/flink
3839
ENV FLINK_PLUGINS_DIR=$FLINK_HOME/plugins
3940
ENV OPERATOR_VERSION=1.10-SNAPSHOT

0 commit comments

Comments
 (0)