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

Upgrade tomcat and jdk #16

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade tomcat and jdk #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3907ca1
Bump jdk from 1.8.0_212 to 1.8.0_382
weiliang-ms Aug 22, 2023
60d2344
Replace jdk11 base image
weiliang-ms Aug 22, 2023
b0ce2c8
Bump tomcat from 8.5.32 to 8.5.92
weiliang-ms Aug 22, 2023
6961b48
Bump tomcat from 8.5.32 to 8.5.92
weiliang-ms Aug 22, 2023
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: 3 additions & 4 deletions java11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11-jre-slim
FROM eclipse-temurin:11-jre-alpine

ARG EXPOSE_PORT=8080
EXPOSE ${EXPOSE_PORT}
Expand All @@ -19,9 +19,8 @@ LABEL io.k8s.description="Platform for running plain Java applications (fat-jar
com.yunify.dev-mode.port="JAVA_DEBUG_PORT:5005"

#Install package
RUN apt update && apt -y install \
fontconfig \
&& rm -rf /var/lib/apt/list/*
RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
&& fc-cache --force

# S2I scripts + README
COPY s2i /usr/local/s2i
Expand Down
2 changes: 1 addition & 1 deletion java8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-alpine
FROM eclipse-temurin:8-jdk-alpine

ARG EXPOSE_PORT=8080
EXPOSE ${EXPOSE_PORT}
Expand Down
9 changes: 4 additions & 5 deletions tomcat85-java11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11-jre-slim
FROM eclipse-temurin:11-jre-alpine


MAINTAINER [email protected]
Expand All @@ -20,14 +20,13 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \

EXPOSE 8080

ENV TOMCAT_VERSION 8.5.32
ENV TOMCAT_VERSION 8.5.92

USER root

#Install package
RUN apt update && apt -y install \
fontconfig \
&& rm -rf /var/lib/apt/list/*
RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
&& fc-cache --force

# Get and Unpack Tomcat
RUN apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions tomcat85-java8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-alpine
FROM eclipse-temurin:8-jdk-alpine


MAINTAINER [email protected]
Expand All @@ -20,7 +20,7 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \

EXPOSE 8080

ENV TOMCAT_VERSION 8.5.32
ENV TOMCAT_VERSION 8.5.92

USER root

Expand Down