Another tweak to GitLab secure storage

This commit is contained in:
TC Johnson 2024-07-19 15:49:29 -05:00
parent b3e388e853
commit ab582b8d3e
No known key found for this signature in database
3 changed files with 6 additions and 6 deletions

View File

@ -168,7 +168,7 @@ build_repositories:
tags: tags:
- build-orchestration - build-orchestration
variables: variables:
SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' SECURE_FILES_DOWNLOAD_PATH: './'
script: script:
- curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
- cp scripts/cicd/build-orchestration/rpm-repo-building/Dockerfile ~/rpm-build-container - cp scripts/cicd/build-orchestration/rpm-repo-building/Dockerfile ~/rpm-build-container
@ -283,7 +283,7 @@ dryrun_build_repositories:
tags: tags:
- build-orchestration - build-orchestration
variables: variables:
SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' SECURE_FILES_DOWNLOAD_PATH: './'
script: script:
- curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
- cp scripts/cicd/build-orchestration/generate-release.sh ~ - cp scripts/cicd/build-orchestration/generate-release.sh ~
@ -373,7 +373,7 @@ nightly_build_repositories:
tags: tags:
- build-orchestration - build-orchestration
variables: variables:
SECURE_FILES_DOWNLOAD_PATH: '/home/gitlab-runner/' SECURE_FILES_DOWNLOAD_PATH: './'
script: script:
- curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
- cp scripts/cicd/build-orchestration/generate-nightly-release.sh ~ - cp scripts/cicd/build-orchestration/generate-nightly-release.sh ~

View File

@ -10,7 +10,7 @@ rm -rf $HOME/srv/rpm/nightly/x86_64/*
# Setup crypto # Setup crypto
export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)" export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)"
cat $HOME/veilid-packages-key.private | gpg --import cat veilid-packages-key.private | gpg --import
gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public
# Copy .deb files into the workspace and generate repo files # Copy .deb files into the workspace and generate repo files

View File

@ -10,7 +10,7 @@ rm -rf $HOME/srv/rpm/stable/x86_64/*
# Setup crypto # Setup crypto
export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)" export GNUPGHOME="$(mktemp -d ~/pgpkeys-XXXXXX)"
cat $HOME/veilid-packages-key.private | gpg --import cat veilid-packages-key.private | gpg --import
gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public gpg --armor --export admin@veilid.org > $HOME/srv/gpg/veilid-packages-key.public
# Copy .deb files into the workspace and generate repo files # Copy .deb files into the workspace and generate repo files
@ -39,7 +39,7 @@ tar -xf amd64-rpms.tar
echo "Copying rpms to container workspace" echo "Copying rpms to container workspace"
cp *x86_64.rpm $HOME/rpm-build-container/mount/repo/stable/x86_64 cp *x86_64.rpm $HOME/rpm-build-container/mount/repo/stable/x86_64
echo "Copying signing material to container workspace" echo "Copying signing material to container workspace"
cp -R $GNUPGHOME $HOME/rpm-build-container/mount/keystore cp -R $GNUPGHOME/* $HOME/rpm-build-container/mount/keystore
echo "Executing container actions" echo "Executing container actions"
docker run --rm -d -it --name rpm-repo-builder --mount type=bind,source=$HOME/rpm-build-container/mount,target=/mount rpm-repo-builder-img:v12 docker run --rm -d -it --name rpm-repo-builder --mount type=bind,source=$HOME/rpm-build-container/mount,target=/mount rpm-repo-builder-img:v12
sleep 2 sleep 2