Skip to content

Commit

Permalink
[RELEASE] fix docker mount volume issue
Browse files Browse the repository at this point in the history

Descriptions of the changes in this PR:

* Motivation

 apache#1674 introduced a regression for running release scripts on mac.
 the destination should be "/home/${USER}" rather than ${LOCAL_HOME}.
 because the docker os is linux. Otherwise the gpg keys can not propagated
 correctly from host machine to docker.

* Changes

 Use `/home/${USER}` as the destination path





Reviewers: Jia Zhai <None>

This closes apache#1845 from sijie/fix_release_scripts
  • Loading branch information
sijie authored Nov 29, 2018
1 parent d7fffac commit b0708b5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions dev/release/000-run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@ if [ "$(uname -s)" == "Linux" ]; then
USER_NAME=${SUDO_USER:=$USER}
USER_ID=$(id -u "${USER_NAME}")
GROUP_ID=$(id -g "${USER_NAME}")
LOCAL_HOME="/home/${USER_NAME}"
else # boot2docker uid and gid
USER_NAME=$USER
USER_ID=1000
GROUP_ID=50
LOCAL_HOME="/Users/${USER_NAME}"
fi

docker build -t "${IMAGE_NAME}-${USER_NAME}" - <<UserSpecificDocker
Expand Down Expand Up @@ -108,7 +106,7 @@ docker run -i -t \
-w ${BOOKKEEPER_ROOT} \
-u "${USER}" \
-v "$(realpath $BOOKKEEPER_ROOT):${BOOKKEEPER_ROOT}" \
-v "$(realpath ~):${LOCAL_HOME}" \
-v "$(realpath ~):/home/${USER_NAME}" \
-e VERSION=${VERSION} \
-e MAJOR_VERSION=${MAJOR_VERSION} \
-e NEXT_VERSION=${NEXT_VERSION} \
Expand Down

0 comments on commit b0708b5

Please sign in to comment.