djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a symlink instead of directly mounting into GOPATH.

Browse Source 
This supports CI better, where the original input dir isn't in GOPATH.

Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2020-08-24 15:48:34 -05:00
parent eb05e7a138
commit cbd6dd3356
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hack/lib/update-codegen.sh
View File

@ -18,10 +18,10 @@ if [[ -z "${CONTAINED:-}" ]]; then
echo "generating code for ${kubeVersion} using ${CODEGEN_IMAGE}..." echo "generating code for ${kubeVersion} using ${CODEGEN_IMAGE}..."
docker run --rm \ docker run --rm \
--env CONTAINED=1 \ --env CONTAINED=1 \
--volume "${ROOT}:/go/src/${BASE_PKG}" \ --volume "${ROOT}:/work" \
--workdir "/go/src/${BASE_PKG}" \ --workdir "/work" \
"${CODEGEN_IMAGE}" \ "${CODEGEN_IMAGE}" \
"/go/src/${BASE_PKG}/hack/lib/$(basename "${BASH_SOURCE[0]}")" \ "/work/hack/lib/$(basename "${BASH_SOURCE[0]}")" \
"${kubeVersion}" \ "${kubeVersion}" \
| sed "s|^|${kubeVersion} > |" | sed "s|^|${kubeVersion} > |"
done done
@ -35,6 +35,13 @@ if [[ "${#KUBE_VERSIONS[@]}" -ne 1 ]]; then
exit 1 exit 1
fi fi
# Link the root directory into GOPATH since that is where output ends up.
GOPATH_ROOT="${GOPATH}/src/${BASE_PKG}"
mkdir -p "$(dirname "${GOPATH_ROOT}")"
ln -s "${ROOT}" "${GOPATH_ROOT}"
ROOT="${GOPATH_ROOT}"
cd "${ROOT}"
# KUBE_VERSION is the full version (e.g., '1.19.0-rc.0'). # KUBE_VERSION is the full version (e.g., '1.19.0-rc.0').
KUBE_VERSION="${KUBE_VERSIONS[0]}" KUBE_VERSION="${KUBE_VERSIONS[0]}"
export KUBE_VERSION export KUBE_VERSION