Replace /root/project by /project

This commit is contained in:
Rodrigo Q. Saramago
2022-09-12 14:53:15 +02:00
parent 6b570c4621
commit 3b16174190
6 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -40,9 +40,9 @@ else
BUILD_DIR="$1"
fi
WORKSPACE="${2:-/root/project}"
WORKSPACE=/project
cd "$WORKSPACE"
cd $WORKSPACE
# shellcheck disable=SC2166
if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex
ROOTDIR="/root/project"
ROOTDIR="/project"
BUILDDIR="${ROOTDIR}/build"
mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"
+4 -4
View File
@@ -51,16 +51,16 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}
echo "-- test_docker @ '${PWD}'"
# NOTE: Since /root/project/ is a dir from outside the container and the owner of the files is different,
# NOTE: Since /project/ is a dir from outside the container and the owner of the files is different,
# git show in the script refuses to work. It must be marked as safe to use first.
# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
docker run \
--rm \
--volume "${PWD}:/root/project" \
--volume "${PWD}:/project" \
"${IMAGE_NAME}" \
bash -c "
git config --global --add safe.directory /root/project &&
/root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
git config --global --add safe.directory /project &&
/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
"
echo "-- push_docker"