Skip to content

Commit 3985f67

Browse files
author
Robert Marshall
committed
Stop using s3 for packaging signing key
- Stop pulling the package signing key from s3. This removes the final dependency requirement for awscli in the container build images. Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8393 Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8398 Related https://gitlab.com/gitlab-org/gitlab-omnibus-builder/-/issues/78 Related https://gitlab.com/gitlab-org/gitlab-omnibus-builder/-/issues/77 Signed-off-by: Robert Marshall <[email protected]>
1 parent c2a94ae commit 3985f67

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

support/import_gpg_secrets.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#!/bin/bash
22
# GPG key for package signing
3-
if [ -n "$SECRET_AWS_ACCESS_KEY_ID" ]; then
4-
echo -e "[default]\naws_access_key_id = $AWS_ACCESS_KEY_ID \naws_secret_access_key = $AWS_SECRET_ACCESS_KEY" > ~/.aws/config
5-
AWS_ACCESS_KEY_ID="$SECRET_AWS_ACCESS_KEY_ID" AWS_SECRET_ACCESS_KEY="$SECRET_AWS_SECRET_ACCESS_KEY" aws s3 cp s3://omnibus-sig/package.sig.key .
6-
gpg --batch --no-tty --allow-secret-key-import --import package.sig.key
7-
rm package.sig.key
3+
if [ -n "$PACKAGE_SIGNING_KEY_FILE" ]; then
4+
gpg --batch --no-tty --allow-secret-key-import --import "$PACKAGE_SIGNING_KEY_FILE"
85
else
96
echo "No GPG secret key were imported."
107
fi

0 commit comments

Comments
 (0)