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

Update Alpine Dockerfile To Allow builder user to read/write public keys #1123

Closed
wants to merge 8 commits into from
Closed

Update Alpine Dockerfile To Allow builder user to read/write public keys #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d43255b
Prevent Uploads In Jenkinsfile
steelhead31 Jan 30, 2025
f896a3e
Fix labels
steelhead31 Jan 30, 2025
ef43425
Update Permissions On Alpine Keystore For Non Root Build User
steelhead31 Jan 30, 2025
224b23d
Test
steelhead31 Jan 30, 2025
8b33fe1
Debug
steelhead31 Jan 30, 2025
97431b9
Test
steelhead31 Jan 30, 2025
a6cdc31
Merge branch 'master' into stable_alpine
steelhead31 Jan 30, 2025
a4ae0d7
Test
steelhead31 Jan 30, 2025
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
2 changes: 2 additions & 0 deletions linux/jdk/alpine/src/main/packaging/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
# Install Adoptium Public Key
sudo chmod 664 /etc/apk/repositories
sudo chgrp abuild /etc/apk/repositories
sudo chmod 775 /etc/apk/keys
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
ls -ltr /etc/apk/keys

# Set permssions
sudo chown -R builder /home/builder/out
Expand Down
2 changes: 2 additions & 0 deletions linux/jre/alpine/src/main/packaging/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
# Install Adoptium Public Key
sudo chmod 664 /etc/apk/repositories
sudo chgrp abuild /etc/apk/repositories
sudo chmod 664 /etc/apk/keys
sudo chmod 775 /etc/apk/keys
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
Expand Down
14 changes: 7 additions & 7 deletions linux_new/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
} else {
echo "Target Doesnt Exist - Upload Files"
// This Upload Works
jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
// jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
break
}
case "Alpine":
Expand All @@ -197,7 +197,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
break
} else {
// This Upload Works
jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
// jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
break
}
case "RPMS":
Expand All @@ -208,7 +208,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
echo "Target Exists - Skipping"
break
} else {
jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true'
// jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true'
break
}
default:
Expand Down Expand Up @@ -907,10 +907,10 @@ post {
echo "Release : ${params.TAG}"
echo "FileName : ${ArchiveFileName}"

build job: 'publish_linux_pkg_src', parameters: [
string(name: 'TAG', value: "${params.TAG}"),
string(name: 'FILENAME', value: "${ArchiveFileName}")
]
//build job: 'publish_linux_pkg_src', parameters: [
// string(name: 'TAG', value: "${params.TAG}"),
// string(name: 'FILENAME', value: "${ArchiveFileName}")
//]
} else {
echo 'Dry Run is enabled. Skipping downstream job trigger.'
}
Expand Down
1 change: 1 addition & 0 deletions linux_new/jdk/alpine/src/main/packaging/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace

# Install Adoptium Public Key
sudo chmod 664 /etc/apk/repositories
sudo chmod 775 /etc/apk/keys
sudo chgrp abuild /etc/apk/repositories
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
Expand Down
1 change: 1 addition & 0 deletions linux_new/jre/alpine/src/main/packaging/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace

# Install Adoptium Public Key
sudo chmod 664 /etc/apk/repositories
sudo chmod 775 /etc/apk/keys
sudo chgrp abuild /etc/apk/repositories
sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
Expand Down