-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1826183: Generate trust bundle for builds
* Create entrypoint script which does the following: ** Check if the CA trust bundle exists in the new neutral location. ** Run `update-ca-trust extract` if a custom PKI is present. * Add mounts.conf to /etc/containers ** Mount /run/secrets from build pod containers to buildah's containers. In RHEL/Fedora, /run/secrets is mounted in from /usr/share/rhel/secrets, and contains host information needed to access subscription content. ** Mount /etc/pki from the build pod to buildah's containers. This contains the TLS trust store that the entrypoint script configures via `update-ca-trust extract`. * Organize image content to simplify the Dockerfile instructions for building `openshift/builder`.
- Loading branch information
1 parent
efbd555
commit 1c3a03e
Showing
9 changed files
with
22 additions
and
10 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#!/bin/sh | ||
|
||
clusterCA="/var/run/configs/openshift.io/pki/tls-ca-bundle.pem" | ||
|
||
if [ -e "$clusterCA" ]; then | ||
echo "Adding cluster TLS certificate authority to trust store" | ||
cp -f "$clusterCA" /etc/pki/ca-trust/source/anchors/cluster-ca-bundle.pem | ||
update-ca-trust extract | ||
fi | ||
|
||
exec "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
/run/secrets:/run/secrets | ||
/etc/pki:/etc/pki |
File renamed without changes.
File renamed without changes.
File renamed without changes.