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

Use eclipse-temurin:8-jdk-focal as default base image #4288

Closed
wants to merge 1 commit into from
Closed

Use eclipse-temurin:8-jdk-focal as default base image #4288

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
10 changes: 6 additions & 4 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

# Declare the BASE_IMAGE argument in the first line, for more detail
# see: https://github.com/moby/moby/issues/38379
ARG BASE_IMAGE=openjdk:8-jdk
ARG BASE_IMAGE=eclipse-temurin:8-jdk-focal

FROM maven:3.6-jdk-8 as builder
FROM eclipse-temurin:8-jdk-focal as builder
Copy link
Member Author

Choose a reason for hiding this comment

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

it's hard to maintain the maven version in multi places, so it's better to use build/mvn to auto-download the expected version.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, and we should cache build/apache-maven* properly in CI jobs, to prevent repeatedly downloading maven.


ARG MVN_ARG

Expand All @@ -48,7 +48,8 @@ WORKDIR /workspace/kyuubi

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y python3 && \
apt-get install -y bash python3 && \
ln -snf /bin/bash /bin/sh && \
./build/dist ${MVN_ARG} && \
mv /workspace/kyuubi/dist /opt/kyuubi && \
# Removing stuff saves time because docker creates a temporary layer
Expand All @@ -71,7 +72,8 @@ COPY --from=builder /opt/kyuubi ${KYUUBI_HOME}
RUN set -ex && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
apt-get install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
ln -snf /bin/bash /bin/sh && \
useradd -u ${kyuubi_uid} -g root kyuubi && \
mkdir -p ${KYUUBI_HOME} ${KYUUBI_LOG_DIR} ${KYUUBI_PID_DIR} ${KYUUBI_WORK_DIR_ROOT} && \
chmod ug+rw -R ${KYUUBI_HOME} && \
Expand Down
7 changes: 4 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# -t the target repo and tag name
# more options can be found with -h

ARG BASE_IMAGE=openjdk:8-jre-slim
ARG BASE_IMAGE=eclipse-temurin:8-jdk-focal
ARG spark_provided="spark_builtin"

FROM ${BASE_IMAGE} as builder_spark_provided
Expand All @@ -34,7 +34,7 @@ ONBUILD ENV SPARK_HOME ${spark_home_in_docker}
FROM ${BASE_IMAGE} as builder_spark_builtin

ONBUILD ENV SPARK_HOME /opt/spark
ONBUILD RUN mkdir -p ${SPARK_HOME}
ONBUILD RUN mkdir -p ${SPARK_HOME}
ONBUILD COPY spark-binary ${SPARK_HOME}

FROM builder_${spark_provided}
Expand All @@ -50,7 +50,8 @@ ENV KYUUBI_WORK_DIR_ROOT ${KYUUBI_HOME}/work
RUN set -ex && \
sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \
apt-get update && \
apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
apt-get install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
ln -snf /bin/bash /bin/sh && \
useradd -u ${kyuubi_uid} -g root kyuubi -d /home/kyuubi -m && \
mkdir -p ${KYUUBI_HOME} ${KYUUBI_LOG_DIR} ${KYUUBI_PID_DIR} ${KYUUBI_WORK_DIR_ROOT} && \
rm -rf /var/cache/apt/*
Expand Down
3 changes: 2 additions & 1 deletion tools/spark-block-cleaner/kubernetes/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM openjdk:8-jre-slim
FROM eclipse-temurin:8-jdk-focal

RUN apt-get update && \
apt install -y tini && \
rm -rf /var/cache/apt/* && \
mkdir /data && \
mkdir -p /opt/block-cleaner && \
mkdir -p /log/cleanerLog
Expand Down