Skip to content
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

Jump to bottom

RANGER-4942: Fix Dockerfiles of ./build_ranger_using_docker.sh #396

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RANGER-4942: Fix Dockerfiles of ./build_ranger_using_docker.sh #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions dev-support/ranger-docker/Dockerfile.ranger
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ ARG RANGER_DB_TYPE
ARG TARGETARCH
ARG RANGER_ADMIN_JAVA_VERSION

RUN if [ "${OS_NAME}" == "UBUNTU" ]; then\
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_ADMIN_JAVA_VERSION}-openjdk-${TARGETARCH}\
update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_ADMIN_JAVA_VERSION}.0-openjdk-${TARGETARCH};\
ENV JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_ADMIN_JAVA_VERSION}.0-openjdk-${TARGETARCH}

RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
update-java-alternatives --set "$JAVA_HOME";\
fi

COPY ./dist/version /home/ranger/dist/
Expand Down
12 changes: 6 additions & 6 deletions dev-support/ranger-docker/Dockerfile.ranger-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM ubuntu:${UBUNTU_VERSION}

ARG TARGETARCH
ARG RANGER_BASE_JAVA_VERSION
ENV OS_NAME UBUNTU
ENV OS_NAME=UBUNTU

# Install tzdata, Python, Java, python-requests
RUN apt-get update && \
Expand All @@ -29,11 +29,11 @@ RUN apt-get update && \
pip3 install requests

# Set environment variables
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
ENV RANGER_DIST /home/ranger/dist
ENV RANGER_SCRIPTS /home/ranger/scripts
ENV RANGER_HOME /opt/ranger
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV JAVA_HOME=/usr/lib/jvm/java-${RANGER_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
ENV RANGER_DIST=/home/ranger/dist
ENV RANGER_SCRIPTS=/home/ranger/scripts
ENV RANGER_HOME=/opt/ranger
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH}

Expand Down
13 changes: 7 additions & 6 deletions dev-support/ranger-docker/Dockerfile.ranger-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,21 @@ FROM ranger-base:latest
ARG RANGER_BUILD_JAVA_VERSION
ARG TARGETARCH

ENV JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}

# Install necessary packages to build Ranger
RUN if [ "${OS_NAME}" == "UBUNTU" ]; then\
RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
apt-get update && apt-get -y install git maven build-essential\
update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}\
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_BUILD_JAVA_VERSION}-openjdk-${TARGETARCH};\
update-java-alternatives --set "$JAVA_HOME";\
fi

RUN if [ "${OS_NAME}" == "RHEL" ]; then\
RUN if [ "${OS_NAME}" = "RHEL" ]; then\
microdnf install -y git maven gcc;\
fi

# Set environment variables
ENV MAVEN_HOME /usr/share/maven
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
ENV MAVEN_HOME=/usr/share/maven
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin

# setup ranger group, and users
RUN mkdir -p /home/ranger/git && \
Expand Down
Loading