Skip to content

Commit 57c1db6

Browse files
committed
performancecopilot#130 Almost there with the SSH_AGENT/SCM integration. Git tag works.
1 parent e13fad0 commit 57c1db6

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To release parfait out to the wider community, you will need the following:
99
* An account on [OSS Sonatype Repo](https://oss.sonatype.org/)
1010

1111
If you're releasing from a Mac/OSX, then you'll also need:
12-
* Docker/colima/Podman
12+
* Docker Desktop (due to SSH_AGENT needs, Docker Desktop is the only one that works...)
1313

1414

1515
OSS Sonatype

releasing-scripts/docker-release-build.sh

+14
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,19 @@ echo "Importing GPGKEY"
1010
# thank goodness for Google
1111
echo $MAVEN_GPG_PASSPHRASE | gpg --batch --yes --passphrase-fd 0 --import /root/gpgkeyexport/gpgkey.prvt.asc
1212

13+
14+
echo "Adding Github to known_hosts files"
15+
# see https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints
16+
cat << EOF >> ~/.ssh/known_hosts
17+
github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
18+
github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
19+
github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
20+
EOF
21+
22+
# echo "configuring Git"
23+
git config --global user.email "$GIT_EMAIL"
24+
git config --global user.name "$GIT_USERNAME"
25+
git config --global --list
26+
1327
echo "Building Parfait"
1428
mvn clean verify gpg:sign

releasing.sh

+11-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@ set -e
55
[ ! -f .releasing.env ] && echo ".releasing.env file not found" && exit 1
66
source .releasing.env
77

8-
[ ! $GIT_USERNAME ] && echo "GIT_USERNAME is not set" && exit 1
9-
[ ! $GIT_EMAIL ] && echo "GIT_EMAIL is not set" && exit 1
10-
[ ! $GPG_PASSPHRASE ] && echo "GPG_PASSPHRASE is not set" && exit 1
8+
[ ! "$GIT_USERNAME" ] && echo "GIT_USERNAME is not set" && exit 1
9+
[ ! "$GIT_EMAIL" ] && echo "GIT_EMAIL is not set" && exit 1
10+
[ ! "$GPG_PASSPHRASE" ] && echo "GPG_PASSPHRASE is not set" && exit 1
1111

12-
docker build . -t parfait-build
13-
docker run --rm --env GIT_USERNAME="${GIT_USERNAME}" --env GIT_EMAIL="${GIT_EMAIL}" --env MAVEN_GPG_PASSPHRASE="${GPG_PASSPHRASE}" -v `pwd`:/parfait -v ~/.m2:/root/.m2 -v ~/gpgkeyexport:/root/gpgkeyexport parfait-builder sh -c 'releasing-scripts/docker-release-build.sh'
12+
docker build . -t parfait-builder
13+
# This runs the Docker-based build:
14+
# * sets up Git & PGP environment variables
15+
# * mounts the code base into /parfait (which becomes the WORKDIR)
16+
# * mounts your GPG exported key (see RELEASING.md for the requirements there)
17+
# * mounts the SSH_AUTH_SOCK so you can leverage your local SSH agent
18+
# * then launches the releasing-scripts/docker-release-build.sh to perform the build inside the container
19+
docker run --rm --env GIT_USERNAME="${GIT_USERNAME}" --env GIT_EMAIL="${GIT_EMAIL}" --env MAVEN_GPG_PASSPHRASE="${GPG_PASSPHRASE}" --env SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock" --volume `pwd`:/parfait --volume ~/.m2:/root/.m2 --volume ~/gpgkeyexport:/root/gpgkeyexport --mount type=bind,src=/run/host-services/ssh-auth.sock,target=/run/host-services/ssh-auth.sock parfait-builder sh -c 'releasing-scripts/docker-release-build.sh'
1420

1521

1622

0 commit comments

Comments
 (0)