build: allow passing ssh agent to docker run in buildx.sh
This commit is contained in:
parent
e08b7aa218
commit
30a02c74dc
|
@ -20,10 +20,13 @@ help() {
|
||||||
echo "--arch amd64|arm64: Target arch to build the EMQ X package for"
|
echo "--arch amd64|arm64: Target arch to build the EMQ X package for"
|
||||||
echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD"
|
echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD"
|
||||||
echo "--builder <BUILDER>: Builder image to pull"
|
echo "--builder <BUILDER>: Builder image to pull"
|
||||||
|
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-debian11"
|
||||||
echo "--system <SYSTEM>: The target OS system the package is being built for, ex: debian11"
|
echo "--system <SYSTEM>: The target OS system the package is being built for, ex: debian11"
|
||||||
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-debian10"
|
echo "--ssh: Pass ssh agent to the builder."
|
||||||
|
echo " Also configures git in container to use ssh instead of https to clone deps"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
USE_SSH='no'
|
||||||
while [ "$#" -gt 0 ]; do
|
while [ "$#" -gt 0 ]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-h|--help)
|
-h|--help)
|
||||||
|
@ -54,6 +57,10 @@ while [ "$#" -gt 0 ]; do
|
||||||
SYSTEM="$2"
|
SYSTEM="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
--ssh)
|
||||||
|
USE_SSH='yes'
|
||||||
|
shift
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "WARN: Unknown arg (ignored): $1"
|
echo "WARN: Unknown arg (ignored): $1"
|
||||||
shift
|
shift
|
||||||
|
@ -72,18 +79,45 @@ if [ "$PKGTYPE" != 'zip' ] && [ "$PKGTYPE" != 'pkg' ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
## Although we have 'deterministic' set in 'erl_opts', and foced overriding at project level,
|
||||||
|
## still, some of the beams might be compiled (e.g. by erlang.mk) without this flag
|
||||||
|
## longer file path means larger beam files
|
||||||
|
## i.e. Keep the path to work dir short!
|
||||||
|
DOCKER_WORKDIR='/emqx'
|
||||||
|
|
||||||
cd "${SRC_DIR:-.}"
|
cd "${SRC_DIR:-.}"
|
||||||
|
|
||||||
set -x
|
cat <<EOF >.gitconfig.tmp
|
||||||
# $SYSTEM below is used by the `relup-base-vsns.escript` to correctly
|
[core]
|
||||||
# output the list of relup base versions.
|
sshCommand = ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
|
||||||
|
[safe]
|
||||||
|
directory = $DOCKER_WORKDIR
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if [ "$USE_SSH" = 'yes' ]; then
|
||||||
|
cat <<EOF >>.gitconfig.tmp
|
||||||
|
[url "ssh://git@github.com/"]
|
||||||
|
insteadOf = https://github.com/
|
||||||
|
EOF
|
||||||
|
# when passing ssh agent, we assume this command is executed locally not in ci, so add '-t' option
|
||||||
|
SSH_AGENT_OPTION="-t -e SSH_AUTH_SOCK=/ssh-agent -v ${SSH_AUTH_SOCK}:/ssh-agent"
|
||||||
|
else
|
||||||
|
SSH_AGENT_OPTION=''
|
||||||
|
fi
|
||||||
|
|
||||||
docker info
|
docker info
|
||||||
docker run --rm --privileged tonistiigi/binfmt:latest --install "${ARCH}"
|
docker run --rm --privileged tonistiigi/binfmt:latest --install "${ARCH}"
|
||||||
|
|
||||||
|
# $SYSTEM below is used by the `relup-base-vsns.escript` to correctly
|
||||||
|
# output the list of relup base versions.
|
||||||
|
# shellcheck disable=SC2086
|
||||||
docker run -i --rm \
|
docker run -i --rm \
|
||||||
-v "$(pwd)":/emqx \
|
-v "$(pwd)":$DOCKER_WORKDIR \
|
||||||
--workdir /emqx \
|
-v "$(pwd)/.gitconfig.tmp":/root/.gitconfig \
|
||||||
|
--workdir $DOCKER_WORKDIR \
|
||||||
--platform="linux/$ARCH" \
|
--platform="linux/$ARCH" \
|
||||||
--user root \
|
--user root \
|
||||||
-e SYSTEM="$SYSTEM" \
|
-e SYSTEM="$SYSTEM" \
|
||||||
|
$SSH_AGENT_OPTION \
|
||||||
"$BUILDER" \
|
"$BUILDER" \
|
||||||
bash -euc "git config --global --add safe.directory /emqx && chown -R root:root _build && make ${PROFILE}-${PKGTYPE} && .ci/build_packages/tests.sh $PROFILE $PKGTYPE"
|
bash -euc "mkdir -p _build && chown -R root:root _build && make ${PROFILE}-${PKGTYPE} && .ci/build_packages/tests.sh $PROFILE $PKGTYPE"
|
||||||
|
|
Loading…
Reference in New Issue