From ce3de2b5168da9a094cdf2c03e70e788e89bb9b8 Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Mon, 10 Aug 2020 16:24:05 -0400 Subject: [PATCH] hack/verify-codegen.sh: updates to be run in CI Signed-off-by: Andrew Keesler --- hack/update-codegen.sh | 17 ++++++++++++++++- hack/verify.sh | 4 +--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index fd97e0f30..2b2c1672f 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -11,7 +11,22 @@ CODEGEN_IMAGE=${CODEGEN_IMAGE:-gcr.io/tanzu-user-authentication/k8s-code-generat function codegen() { PKG="$1" shift 1 - docker run --rm -v "$ROOT:/go/src/$BASE_PKG" -w "/go/src/$BASE_PKG/$PKG" "${CODEGEN_IMAGE}" "$@" 2>&1 | sed "s|^|$1 ($PKG) > |" + if [[ ${IN_DOCKER:-0} -eq 1 ]]; then + # Already in a container ($CODEGEN_IMAGE). + mkdir -p "$(dirname /go/src/$BASE_PKG/$PKG)" + ln -sf "$ROOT" "/go/src/$BASE_PKG/$PKG" + cd "/go/src/$BASE_PKG/$PKG" + /codegen/entrypoint.sh "$@" 2>&1 | sed "s|^|$1 ($PKG) > |" + else + # Local workstation. + docker run \ + --rm \ + --volume "$ROOT:/go/src/$BASE_PKG" \ + --workdir "/go/src/$BASE_PKG/$PKG" \ + "${CODEGEN_IMAGE}" \ + /codegen/entrypoint.sh "$@" 2>&1 \ + | sed "s|^|$1 ($PKG) > |" + fi } codegen kubernetes/1.19/api generate-groups deepcopy,defaulter \ diff --git a/hack/verify.sh b/hack/verify.sh index d23e38962..375242d13 100755 --- a/hack/verify.sh +++ b/hack/verify.sh @@ -6,6 +6,4 @@ set -euo pipefail ROOT="$(realpath "$(dirname "${BASH_SOURCE[0]}")/..")" "$ROOT/hack/module.sh" lint - -# TODO: re-enable once we figure out how to run docker in CI -#"$ROOT/hack/verify-codegen.sh" +"$ROOT/hack/verify-codegen.sh"