Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index bbdd4b37edd1eac164965ae038d6801b2b61070f..c7a9cbfb8ea514e40017a0ae77515c54d6afe065 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -151,12 +151,15 @@ packages-in-docker: check-arvados-directory workbench2-build-image
        docker run --env ci="true" \
                --env ARVADOS_DIRECTORY=/tmp/arvados \
                --env APP_NAME=${APP_NAME} \
+               --env VERSION="${VERSION}" \
                --env ITERATION=${ITERATION} \
                --env TARGETS="${TARGETS}" \
+               --env MAINTAINER="${MAINTAINER}" \
+               --env DESCRIPTION="${DESCRIPTION}" \
                -w="/tmp/workbench2" \
                -t -v ${WORKSPACE}:/tmp/workbench2 \
                -v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-               make packages
+               sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
        (cd docker && docker build -t workbench2-build .)