File tree Expand file tree Collapse file tree 4 files changed +16
-7
lines changed
dev-support/create-release Expand file tree Collapse file tree 4 files changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -105,6 +105,9 @@ $ scp ~/gpg.example.apache.pub example.gce.host:
105
105
# gpg-agent's extra socket (this will restrict what commands the remote node is allowed to have
106
106
# your agent handle. Note that the gpg guide above can help you set this up in your ssh config
107
107
# rather than typing it in ssh like this every time.
108
+ # Note that as of maven-gpg-plugin 3.0.1, with gnupg >= 2.1, the plugin uses
109
+ # `--pinentry-mode error`, which is apparently not supported over the `extra` socket. These
110
+ # instructions may require tweaking.
108
111
$ ssh -i ~/.ssh/my_id \
109
112
-R "/run/user/1000/gnupg/S.gpg-agent:$(gpgconf --list-dir agent-extra-socket)" \
110
113
-R "/run/user/1000/gnupg/S.gpg-agent.extra:$(gpgconf --list-dir agent-extra-socket)" \
Original file line number Diff line number Diff line change @@ -311,7 +311,7 @@ if [ "${HOST_OS}" == "DARWIN" ]; then
311
311
fi
312
312
log " Launching ssh reverse tunnel from the container to gpg agent."
313
313
log " we should clean this up for you. If that fails the PID is in gpg-proxy.ssh.pid"
314
- ssh -p 62222 -R " /home/${USER} /.gnupg/S.gpg-agent:$( gpgconf --list-dir agent-extra- socket) " \
314
+ ssh -p 62222 -R " /home/${USER} /.gnupg/S.gpg-agent:$( gpgconf --list-dir agent-socket) " \
315
315
-i " ${HOME} /.ssh/id_rsa" -N -n localhost > gpg-proxy.ssh.log 2>&1 &
316
316
echo $! > " ${WORKDIR} /gpg-proxy.ssh.pid"
317
317
else
321
321
# agent socket and agent extra socket to your local gpg-agent's extra socket. See the README.txt
322
322
# for an example.
323
323
GPG_PROXY_MOUNT=(--mount \
324
- " type=bind,src=$( gpgconf --list-dir agent-extra- socket) ,dst=/home/${USER} /.gnupg/S.gpg-agent" )
324
+ " type=bind,src=$( gpgconf --list-dir agent-socket) ,dst=/home/${USER} /.gnupg/S.gpg-agent" )
325
325
fi
326
326
327
327
banner " Building $RELEASE_TAG ; output will be at $WORKDIR /output"
Original file line number Diff line number Diff line change 32
32
#
33
33
# test like:
34
34
#
35
- # ssh -p 62222 -R "/home/${USER}/.gnupg/S.gpg-agent:$(gpgconf --list-dir agent-extra- socket)" \
35
+ # ssh -p 62222 -R "/home/${USER}/.gnupg/S.gpg-agent:$(gpgconf --list-dir agent-socket)" \
36
36
# -i "${HOME}/.ssh/id_rsa" -N -n localhost
37
37
#
38
38
# launch a docker container to do work that shares the mount for the gpg agent
Original file line number Diff line number Diff line change 30
30
DRY_RUN=${DRY_RUN:- 1} # default to dry run
31
31
DEBUG=${DEBUG:- 0}
32
32
GPG=${GPG:- gpg}
33
- GPG_ARGS=(--no-autostart --batch)
33
+ GPG_ARGS=(--no-autostart --batch --pinentry-mode error )
34
34
if [ -n " ${GPG_KEY} " ]; then
35
35
GPG_ARGS=(" ${GPG_ARGS[@]} " --local-user " ${GPG_KEY} " )
36
36
fi
@@ -670,10 +670,16 @@ make_binary_release() {
670
670
# a third to assemble the binary artifact. Trying to do
671
671
# all in the one invocation fails; a problem in our
672
672
# assembly spec to in maven. TODO. Meantime, three invocations.
673
- " ${MVN[@]} " clean install -DskipTests
674
- " ${MVN[@]} " site -DskipTests
673
+ cmd=(" ${MVN[@]} " clean install -DskipTests)
674
+ echo " ${cmd[*]} "
675
+ " ${cmd[@]} "
676
+ cmd=(" ${MVN[@]} " site -DskipTests)
677
+ echo " ${cmd[*]} "
678
+ " ${cmd[@]} "
675
679
kick_gpg_agent
676
- " ${MVN[@]} " install assembly:single -DskipTests -Dcheckstyle.skip=true " ${PUBLISH_PROFILES[@]} "
680
+ cmd=(" ${MVN[@]} " install assembly:single -DskipTests -Dcheckstyle.skip=true " ${PUBLISH_PROFILES[@]} " )
681
+ echo " ${cmd[*]} "
682
+ " ${cmd[@]} "
677
683
678
684
# Check there is a bin gz output. The build may not produce one: e.g. hbase-thirdparty.
679
685
local f_bin_prefix=" ./${PROJECT} -assembly/target/${base_name} "
You can’t perform that action at this time.
0 commit comments