Skip to content

Commit f72c575

Browse files
committed
Add azurelinux/upgrade distroless to azurelinux
1 parent 4bce619 commit f72c575

File tree

8 files changed

+113
-20
lines changed

8 files changed

+113
-20
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ARG IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG TAG="3.0"
3+
FROM ${IMAGE}:${TAG}
4+
5+
LABEL "Author"="Microsoft"
6+
LABEL "Support"="Microsoft OpenJDK Support <[email protected]>"
7+
8+
ARG package="msopenjdk-11"
9+
ARG PKGS="tzdata ca-certificates freetype shadow-utils"
10+
11+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
12+
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
13+
14+
RUN tdnf update -y && \
15+
tdnf install -y ${package} ${PKGS} && \
16+
tdnf clean all && \
17+
groupadd --system --gid=101 app && \
18+
adduser --uid 101 --gid 101 --system app && \
19+
install -d -m 0755 -o 101 -g 101 "/home/app" && \
20+
rm -rf /var/cache/tdnf && \
21+
rm -rf /usr/lib/jvm/${package}/lib/src.zip && \
22+
echo java -Xshare:dump && \
23+
java -Xshare:dump
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ARG IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG TAG="3.0"
3+
FROM ${IMAGE}:${TAG}
4+
5+
LABEL "Author"="Microsoft"
6+
LABEL "Support"="Microsoft OpenJDK Support <[email protected]>"
7+
8+
ARG package="msopenjdk-17"
9+
ARG PKGS="tzdata ca-certificates freetype shadow-utils"
10+
11+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
12+
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-17
13+
14+
RUN tdnf update -y && \
15+
tdnf install -y ${package} ${PKGS} && \
16+
tdnf clean all && \
17+
groupadd --system --gid=101 app && \
18+
adduser --uid 101 --gid 101 --system app && \
19+
install -d -m 0755 -o 101 -g 101 "/home/app" && \
20+
rm -rf /var/cache/tdnf && \
21+
rm -rf /usr/lib/jvm/${package}/lib/src.zip && \
22+
echo java -Xshare:dump && \
23+
java -Xshare:dump
24+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ARG IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG TAG="3.0"
3+
FROM ${IMAGE}:${TAG}
4+
5+
LABEL "Author"="Microsoft"
6+
LABEL "Support"="Microsoft OpenJDK Support <[email protected]>"
7+
8+
ARG package="msopenjdk-21"
9+
ARG PKGS="tzdata ca-certificates freetype shadow-utils"
10+
11+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
12+
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-21
13+
14+
RUN tdnf update -y && \
15+
tdnf install -y ${package} ${PKGS} && \
16+
tdnf clean all && \
17+
groupadd --system --gid=101 app && \
18+
adduser --uid 101 --gid 101 --system app && \
19+
install -d -m 0755 -o 101 -g 101 "/home/app" && \
20+
rm -rf /var/cache/tdnf && \
21+
rm -rf /usr/lib/jvm/${package}/lib/src.zip && \
22+
echo java -Xshare:dump && \
23+
java -Xshare:dump
24+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ARG IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG TAG="3.0"
3+
FROM ${IMAGE}:${TAG}
4+
5+
LABEL "Author"="Microsoft"
6+
LABEL "Support"="Microsoft OpenJDK Support <[email protected]>"
7+
8+
ARG JDK_PKG="temurin-8-jdk"
9+
ARG PKGS="tzdata ca-certificates freetype shadow-utils"
10+
11+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
12+
ENV JAVA_HOME=/usr/lib/jvm/temurin-8-jdk
13+
14+
# Install pre-reqs
15+
RUN tdnf update -y && \
16+
tdnf install -y ${JDK_PKG} ${PKGS} && \
17+
tdnf clean all && \
18+
groupadd --system --gid=101 app && \
19+
adduser --uid 101 --gid 101 --system app && \
20+
install -d -m 0755 -o 101 -g 101 "/home/app" && \
21+
rm -rf /var/cache/tdnf && \
22+
rm -rf ./usr/lib/jvm/${JDK_PKG}/src.zip

docker/distroless/Dockerfile.msopenjdk-11-jdk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG INSTALLER_IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
2-
ARG INSTALLER_TAG="2.0"
3-
ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
4-
ARG BASE_TAG="2.0"
1+
ARG INSTALLER_IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG INSTALLER_TAG="3.0"
3+
ARG BASE_IMAGE="mcr.microsoft.com/azurelinux/distroless/base"
4+
ARG BASE_TAG="3.0"
55

66
FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
77

@@ -12,7 +12,7 @@ ARG JDK_URL="https://aka.ms/download-jdk/microsoft-jdk-11-linux-ARCH.tar.gz"
1212
# Create a non-root user and group (just like .NET's image)
1313
RUN mkdir /staging \
1414
&& tdnf update -y \
15-
&& tdnf install -y --releasever=2.0 --installroot /staging zlib \
15+
&& tdnf install -y --releasever=3.0 --installroot /staging zlib \
1616
&& tdnf install -y gawk shadow-utils ca-certificates tar \
1717
&& groupadd --system --gid=101 app \
1818
&& adduser --uid 101 --gid 101 --shell /bin/false --system app \

docker/distroless/Dockerfile.msopenjdk-17-jdk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG INSTALLER_IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
2-
ARG INSTALLER_TAG="2.0"
3-
ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
4-
ARG BASE_TAG="2.0"
1+
ARG INSTALLER_IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG INSTALLER_TAG="3.0"
3+
ARG BASE_IMAGE="mcr.microsoft.com/azurelinux/distroless/base"
4+
ARG BASE_TAG="3.0"
55

66
FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
77

@@ -12,7 +12,7 @@ ARG JDK_URL="https://aka.ms/download-jdk/microsoft-jdk-17-linux-ARCH.tar.gz"
1212
# Create a non-root user and group (just like .NET's image)
1313
RUN mkdir /staging \
1414
&& tdnf update -y \
15-
&& tdnf install -y --releasever=2.0 --installroot /staging zlib \
15+
&& tdnf install -y --releasever=3.0 --installroot /staging zlib \
1616
&& tdnf install -y gawk shadow-utils ca-certificates tar \
1717
&& groupadd --system --gid=101 app \
1818
&& adduser --uid 101 --gid 101 --shell /bin/false --system app \

docker/distroless/Dockerfile.msopenjdk-21-jdk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG INSTALLER_IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
2-
ARG INSTALLER_TAG="2.0"
3-
ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
4-
ARG BASE_TAG="2.0"
1+
ARG INSTALLER_IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG INSTALLER_TAG="3.0"
3+
ARG BASE_IMAGE="mcr.microsoft.com/azurelinux/distroless/base"
4+
ARG BASE_TAG="3.0"
55

66
FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
77

@@ -12,7 +12,7 @@ ARG JDK_URL="https://aka.ms/download-jdk/microsoft-jdk-21-linux-ARCH.tar.gz"
1212
# Create a non-root user and group (just like .NET's image)
1313
RUN mkdir /staging \
1414
&& tdnf update -y \
15-
&& tdnf install -y --releasever=2.0 --installroot /staging zlib \
15+
&& tdnf install -y --releasever=3.0 --installroot /staging zlib \
1616
&& tdnf install -y gawk shadow-utils ca-certificates tar \
1717
&& groupadd --system --gid=101 app \
1818
&& adduser --uid 101 --gid 101 --shell /bin/false --system app \

docker/distroless/Dockerfile.temurin-8-jdk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG INSTALLER_IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
2-
ARG INSTALLER_TAG="2.0"
3-
ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
4-
ARG BASE_TAG="2.0"
1+
ARG INSTALLER_IMAGE="mcr.microsoft.com/azurelinux/base/core"
2+
ARG INSTALLER_TAG="3.0"
3+
ARG BASE_IMAGE="mcr.microsoft.com/azurelinux/distroless/base"
4+
ARG BASE_TAG="3.0"
55

66
FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
77

@@ -12,7 +12,7 @@ ARG JDK_URL="https://api.adoptium.net/v3/binary/latest/8/ga/linux/ARCH/jdk/hotsp
1212
# Create a non-root user and group (just like .NET's image)
1313
RUN mkdir /staging \
1414
&& tdnf update -y \
15-
&& tdnf install -y --releasever=2.0 --installroot /staging zlib \
15+
&& tdnf install -y --releasever=3.0 --installroot /staging zlib \
1616
&& tdnf install -y gawk shadow-utils ca-certificates tar \
1717
&& groupadd --system --gid=101 app \
1818
&& adduser --uid 101 --gid 101 --shell /bin/false --system app \

0 commit comments

Comments
 (0)