From 97b6c6465367662ba6b2a51f8612acba61a72871 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 20 Dec 2024 13:15:07 -0500 Subject: [PATCH] Trim characters to get us under the limit --- task/buildah-oci-ta/0.2/buildah-oci-ta.yaml | 5 ++--- task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml | 5 ++--- task/buildah-remote/0.2/buildah-remote.yaml | 5 ++--- task/buildah/0.2/buildah.yaml | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml b/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml index c7d0a5e8b..adadeaab0 100644 --- a/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml +++ b/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml @@ -445,9 +445,8 @@ spec: # 2. Activation-keys will be used when the key 'org' exists in the activation key secret. # 3. try to pre-register and mount files to the correct location so that users do no need to modify Dockerfiles. # 3. If the Dockerfile contains the string "subcription-manager register", add the activation-keys volume - # to buildah but don't pre-register for backwards compatibility. In this case mount an empty directory on - # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included in the produced - # container. + # to buildah but don't pre-register for backwards compatibility. Mount an empty directory on + # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included if [ "${HERMETIC}" != "true" ] && [ -e /activation-key/org ]; then cp -r --preserve=mode "$ACTIVATION_KEY_PATH" /tmp/activation-key diff --git a/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml index c90fde69c..69fe76b57 100644 --- a/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml +++ b/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml @@ -478,9 +478,8 @@ spec: # 2. Activation-keys will be used when the key 'org' exists in the activation key secret. # 3. try to pre-register and mount files to the correct location so that users do no need to modify Dockerfiles. # 3. If the Dockerfile contains the string "subcription-manager register", add the activation-keys volume - # to buildah but don't pre-register for backwards compatibility. In this case mount an empty directory on - # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included in the produced - # container. + # to buildah but don't pre-register for backwards compatibility. Mount an empty directory on + # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included if [ "${HERMETIC}" != "true" ] && [ -e /activation-key/org ]; then cp -r --preserve=mode "$ACTIVATION_KEY_PATH" /tmp/activation-key diff --git a/task/buildah-remote/0.2/buildah-remote.yaml b/task/buildah-remote/0.2/buildah-remote.yaml index 2156057e5..f39453f77 100644 --- a/task/buildah-remote/0.2/buildah-remote.yaml +++ b/task/buildah-remote/0.2/buildah-remote.yaml @@ -454,9 +454,8 @@ spec: # 2. Activation-keys will be used when the key 'org' exists in the activation key secret. # 3. try to pre-register and mount files to the correct location so that users do no need to modify Dockerfiles. # 3. If the Dockerfile contains the string "subcription-manager register", add the activation-keys volume - # to buildah but don't pre-register for backwards compatibility. In this case mount an empty directory on - # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included in the produced - # container. + # to buildah but don't pre-register for backwards compatibility. Mount an empty directory on + # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included if [ "${HERMETIC}" != "true" ] && [ -e /activation-key/org ]; then cp -r --preserve=mode "$ACTIVATION_KEY_PATH" /tmp/activation-key diff --git a/task/buildah/0.2/buildah.yaml b/task/buildah/0.2/buildah.yaml index 56ec83fa4..8e817df83 100644 --- a/task/buildah/0.2/buildah.yaml +++ b/task/buildah/0.2/buildah.yaml @@ -376,9 +376,8 @@ spec: # 2. Activation-keys will be used when the key 'org' exists in the activation key secret. # 3. try to pre-register and mount files to the correct location so that users do no need to modify Dockerfiles. # 3. If the Dockerfile contains the string "subcription-manager register", add the activation-keys volume - # to buildah but don't pre-register for backwards compatibility. In this case mount an empty directory on - # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included in the produced - # container. + # to buildah but don't pre-register for backwards compatibility. Mount an empty directory on + # shared emptydir volume to "/etc/pki/entitlement" to prevent certificates from being included if [ "${HERMETIC}" != "true" ] && [ -e /activation-key/org ]; then cp -r --preserve=mode "$ACTIVATION_KEY_PATH" /tmp/activation-key