diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 820ee17..e63cc76 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -22,7 +22,7 @@ COPY --from=tools /app/release-notary /usr/local/bin/ ENV CATTLE_DASHBOARD_UI_VERSION="v2.8.0-kube-explorer-ui-rc3" ENV CATTLE_API_UI_VERSION="1.1.11" -ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GOPROXY SKIP_COMPRESS GITHUB_REPOSITORY GITHUB_TOKEN +ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GOPROXY SKIP_COMPRESS GITHUB_REPOSITORY GITHUB_TOKEN GITHUB_REF ENV DAPPER_SOURCE /go/src/github.com/cnrancher/kube-explorer ENV DAPPER_OUTPUT ./bin ./dist ENV DAPPER_DOCKER_SOCKET true diff --git a/scripts/version b/scripts/version index 9e7a5b8..a53d0eb 100755 --- a/scripts/version +++ b/scripts/version @@ -1,5 +1,9 @@ #!/bin/bash +if [[ ${GITHUB_REF} == refs/tags/* ]]; then + DRONE_TAG=${DRONE_TAG:-${GITHUB_REF#refs/tags/}} +fi + if [ -n "$(git status --porcelain --untracked-files=no)" ]; then DIRTY="-dirty" fi