From 42429554579332df41eb2c909d1ba9b59bda86d2 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Mon, 18 Sep 2023 19:52:57 +0530 Subject: [PATCH] OPSEXP-2239 testing --- .github/workflows/main.yml | 10 +++++----- Dockerfile | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88c9efa..94f4317 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,11 +32,11 @@ jobs: flavor: centos major: 7 java_major: 17 - - base_image: - flavor: rockylinux - major: 9 - java_major: 11 - jdist: jdk + # - base_image: + # flavor: rockylinux + # major: 9 + # java_major: 11 + # jdist: jdk runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index f2e84ed..d363bdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,21 @@ ENV JAVA_HOME /etc/alternatives/jre ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 +RUN \ + yum update --security -y && \ + if [ "$JDIST" = 'jdk' ]; then JAVA_PKG_TYPE="devel"; else JAVA_PKG_TYPE="headless"; fi && \ + yum install -y langpacks-en java-${JAVA_MAJOR}-openjdk-${JAVA_PKG_TYPE} && \ + yum clean all && rm -rf /var/cache/yum + +FROM rockylinux:9.2.20230513 AS rockylinux9 + +ARG JDIST +ARG JAVA_MAJOR + +ENV JAVA_HOME /etc/alternatives/jre +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 + RUN \ yum update --security -y && \ if [ "$JDIST" = 'jdk' ]; then JAVA_PKG_TYPE="devel"; else JAVA_PKG_TYPE="headless"; fi && \