Skip to content

Commit f0053d3

Browse files
authored
Add Azure Linux 3.0 Distribution (#120)
* Add Azure Linux 3.0 Distribution * Update build configurations to include Azure Linux
1 parent a90952d commit f0053d3

File tree

8 files changed

+130
-9
lines changed

8 files changed

+130
-9
lines changed

.devops/build.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ parameters:
2525
- name: jobs
2626
type: object
2727
default:
28+
azurelinux_8:
29+
new_LTS_image: false
30+
distro: azurelinux
31+
version: 8
32+
package: temurin-8
33+
image: "image-repository"
34+
tag: "3.0"
2835
mariner_8:
2936
new_LTS_image: false
3037
distro: mariner
@@ -48,6 +55,13 @@ parameters:
4855
package: msopenjdk-11
4956
image: "image-repository"
5057
tag: "image-tag"
58+
azurelinux_11:
59+
new_LTS_image: false
60+
distro: azurelinux
61+
version: 11
62+
package: msopenjdk-11
63+
image: "image-repository"
64+
tag: "3.0"
5165
mariner_11:
5266
new_LTS_image: false
5367
distro: mariner
@@ -71,6 +85,13 @@ parameters:
7185
package: msopenjdk-17
7286
image: "image-repository"
7387
tag: "image-tag"
88+
azurelinux_17:
89+
new_LTS_image: false
90+
distro: azurelinux
91+
version: 17
92+
package: msopenjdk-17
93+
image: "image-repository"
94+
tag: "3.0"
7495
mariner_17:
7596
new_LTS_image: false
7697
distro: mariner
@@ -94,6 +115,13 @@ parameters:
94115
package: msopenjdk-21
95116
image: "image-repository"
96117
tag: "image-tag"
118+
azurelinux_21:
119+
new_LTS_image: false
120+
distro: azurelinux
121+
version: 21
122+
package: msopenjdk-21
123+
image: "image-repository"
124+
tag: "3.0"
97125
mariner_21:
98126
new_LTS_image: false
99127
distro: mariner
@@ -132,7 +160,7 @@ extends:
132160
- job: build_internal
133161
displayName: "build internal"
134162
pool:
135-
name: JEG-mariner2.0-x64-release
163+
name: JEG-azurelinux-x64-release
136164
os: linux
137165
strategy:
138166
matrix: ${{ parameters.jobs }}
@@ -198,7 +226,7 @@ extends:
198226
displayName: "build public "
199227
dependsOn: wait_for_validation
200228
pool:
201-
name: JEG-mariner2.0-x64-release
229+
name: JEG-azurelinux-x64-release
202230
os: linux
203231
strategy:
204232
matrix: ${{ parameters.jobs }}

.github/workflows/build-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
baseimage: ["mariner", "distroless"]
20+
baseimage: ["azurelinux", "mariner", "distroless"]
2121

2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -37,7 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
jdkversion: [11, 17, 21] # Only build LTS releases
40-
baseimage: ["mariner", "ubuntu", "distroless"]
40+
baseimage: ["azurelinux", "mariner", "ubuntu", "distroless"]
4141

4242
steps:
4343
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/check-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distros: [ "mariner", "distroless" ]
15+
distros: [ "azurelinux", "mariner", "distroless" ]
1616
jdkvendor: [ "temurin" ]
1717
jdkversion: [ { major: "8", expected: "1.8.0_452" } ]
1818
steps:
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
distros: [ "mariner", "distroless", "ubuntu" ]
41+
distros: [ "azurelinux", "mariner", "distroless", "ubuntu" ]
4242
jdkvendor: [ "msopenjdk" ]
4343
jdkversion: [ { major: "11", expected: "11.0.27" }, { major: "17", expected: "17.0.15" }, { major: "21", expected: "21.0.7" } ]
4444
steps:

.github/workflows/validate-published-images.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distros: ["mariner", "distroless"]
15+
distros: ["azurelinux", "mariner", "distroless"]
1616
jdkvendor: ["temurin"]
1717
jdkversion: [{ major: "8", expected: "1.8.0_452" }]
1818
steps:
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
distros: ["mariner", "distroless", "ubuntu"]
34+
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
3535
jdkvendor: ["msopenjdk"]
3636
jdkversion:
3737
[
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
distros: ["mariner", "distroless", "ubuntu"]
58+
distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
5959
jdkvendor: ["msopenjdk"]
6060
jdkversion:
6161
[
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

0 commit comments

Comments
 (0)