Skip to content

Commit 5ca028d

Browse files
steelhead31steelhead31
authored
Add files required to consistently build Alpine APKs for January Release (#1119)
* Add Jan APK Updates * Fix APK package build * Update alpine for automation. * Update Opensuse/sles templates for JDK/JRE8
1 parent 1b0aa4e commit 5ca028d

File tree

22 files changed

+102
-62
lines changed

22 files changed

+102
-62
lines changed

‎linux/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ def jenkinsStepAlpine() {
344344
}
345345
// reallocate jenkins agent per element in list
346346
if (ApkARCH == 'x86_64' || ApkARCH == 'aarch64') {
347-
node("linux&&${apkLabel}") {
347+
node("linux&&apkbuild&&${apkLabel}") {
348348
setup('Alpine', "${ApkARCH}")
349349
tool name: 'jfrog-cli', type: 'jfrog'
350350
unstash 'installercode'

‎linux/jdk/alpine/src/main/packaging/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.19
3+
FROM ${CONTAINER_REGISTRY}alpine:latest
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \

‎linux/jdk/alpine/src/main/packaging/entrypoint.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@ set -euox pipefail
66
mkdir /home/builder/workspace
77
cp -R /home/builder/build/generated/packaging /home/builder/workspace
88

9+
# Install Adoptium Public Key
10+
sudo chmod 664 /etc/apk/repositories
11+
sudo chgrp abuild /etc/apk/repositories
12+
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
13+
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
14+
sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
15+
916
# Set permssions
1017
sudo chown -R builder /home/builder/out
1118

1219
# Build package and set distributions it supports
1320
cd /home/builder/workspace/packaging
21+
sudo apk update
1422
abuild -r
1523

1624
arch=$(abuild -A)

‎linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
22
pkgname=temurin-11
3-
pkgver=11.0.25_p9
3+
pkgver=11.0.26_p4
44
# replace _p1 with _1
55
_pkgver=${pkgver/_p/_}
66
_pkgverplus=${pkgver/_p/+}
@@ -95,7 +95,7 @@ _jdk() {
9595
}
9696

9797
sha256sums="
98-
0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82 OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
98+
2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
9999
e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java
100100
22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0 TestCryptoLevel.java
101101
9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933 TestECDSA.java

‎linux/jdk/alpine/src/main/packaging/temurin/17/APKBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
22
pkgname=temurin-17
3-
pkgver=17.0.13_p11
3+
pkgver=17.0.14_p7
44
# replace _p1 with _1
55
_pkgver=${pkgver/_p/_}
66
_pkgverplus=${pkgver/_p/+}
@@ -95,7 +95,7 @@ _jdk() {
9595
}
9696

9797
sha256sums="
98-
67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071 OpenJDK17U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
98+
259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358 OpenJDK17U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
9999
e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java
100100
22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0 TestCryptoLevel.java
101101
9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933 TestECDSA.java

‎linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
22
pkgname=temurin-21
3-
pkgver=21.0.5_p11
3+
pkgver=21.0.6_p7
44
# replace _p1 with _1
55
_pkgver=${pkgver/_p/_}
66
_pkgverplus=${pkgver/_p/+}
@@ -97,10 +97,10 @@ _jdk() {
9797

9898
case "$CARCH" in
9999
x86_64)
100-
_arch_sum="8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909"
100+
_arch_sum="6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3"
101101
;;
102102
aarch64)
103-
_arch_sum="f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747"
103+
_arch_sum="2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4"
104104
;;
105105
esac
106106

‎linux/jdk/alpine/src/main/packaging/temurin/23/APKBUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
22
pkgname=temurin-23
3-
pkgver=23.0.1_p11
3+
pkgver=23.0.2_p7
44
# replace _p1 with _1
55
_pkgver=${pkgver/_p/_}
66
_pkgverplus=${pkgver/_p/+}
@@ -97,10 +97,10 @@ _jdk() {
9797

9898
case "$CARCH" in
9999
x86_64)
100-
_arch_sum="4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6"
100+
_arch_sum="2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99"
101101
;;
102102
aarch64)
103-
_arch_sum="ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86"
103+
_arch_sum="b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570"
104104
;;
105105
esac
106106

‎linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
22
pkgname=temurin-8-jdk
3-
pkgver=8.432.06
3+
pkgver=8.442.06
44
# replace 8. with 8u and .01 with b-01
55
_pkgver=${pkgver/8./8u}
66
_pkgver=${_pkgver%.*}b${_pkgver#*.}
@@ -67,6 +67,6 @@ package() {
6767
}
6868

6969
sha256sums="
70-
86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d OpenJDK8U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
70+
9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f OpenJDK8U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
7171
e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java
7272
"

‎linux/jre/alpine/src/main/packaging/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG CONTAINER_REGISTRY=""
22

3-
FROM ${CONTAINER_REGISTRY}alpine:3.19
3+
FROM ${CONTAINER_REGISTRY}alpine:latest
44
ENV GOSU_VERSION 1.14
55

66
RUN set -eux; \
@@ -9,15 +9,19 @@ RUN set -eux; \
99
alpine-sdk \
1010
bash \
1111
ca-certificates \
12+
doas \
1213
dpkg \
13-
sudo
14+
sudo \
15+
wget
1416

1517
# Create unprivileged user for building, see
1618
# https://github.com/hexops/dockerfile#use-a-static-uid-and-gid
1719
RUN adduser -D -h /home/builder builder \
1820
&& addgroup builder abuild \
19-
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
21+
&& echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \
22+
&& echo 'permit builder as root' > /etc/doas.d/doas.conf
2023

24+
# Add GPG key
2125
USER builder
2226
WORKDIR /home/builder
2327
RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \

‎linux/jre/alpine/src/main/packaging/entrypoint.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@ set -euox pipefail
66
mkdir /home/builder/workspace
77
cp -R /home/builder/build/generated/packaging /home/builder/workspace
88

9+
# Install Adoptium Public Key
10+
sudo chmod 664 /etc/apk/repositories
11+
sudo chgrp abuild /etc/apk/repositories
12+
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
13+
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
14+
sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
15+
916
# Set permssions
1017
sudo chown -R builder /home/builder/out
1118

1219
# Build package and set distributions it supports
1320
cd /home/builder/workspace/packaging
21+
sudo apk update
1422
abuild -r
1523

1624
arch=$(abuild -A)

0 commit comments

Comments
 (0)