This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 8eabba1278a632b941180603ed754df49da869dc Author: Marcus Christie <[email protected]> AuthorDate: Wed Jun 9 13:03:12 2021 -0400 AIRAVATA-3455 Updating build scripts with auth frontend build --- .dockerignore | 1 + Dockerfile | 9 +++++++++ build_js.sh | 1 + django_airavata/apps/admin/yarn.lock | 5 +++++ django_airavata/apps/dataparsers/yarn.lock | 5 +++++ django_airavata/apps/groups/yarn.lock | 5 +++++ lint_js.sh | 1 + 7 files changed, 27 insertions(+) diff --git a/.dockerignore b/.dockerignore index e377819..f1930b1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,3 +5,4 @@ venv **/dist *.sqlite3 **/settings_local*.py +.tox diff --git a/Dockerfile b/Dockerfile index 8e4fd4e..a704844 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,13 @@ RUN yarn COPY ./django_airavata/apps/groups/ . RUN yarn run build +# build auth javascript +WORKDIR /code/django_airavata/apps/auth +COPY ./django_airavata/apps/auth/package.json ./django_airavata/apps/auth/yarn.lock ./ +RUN yarn +COPY ./django_airavata/apps/auth/ . +RUN yarn run build + # build workspace/django-airavata-workspace-plugin-api javascript # This one must come before workspace build WORKDIR /code/django_airavata/apps/workspace/django-airavata-workspace-plugin-api @@ -83,6 +90,8 @@ WORKDIR /code/django_airavata/apps/admin/static/django_airavata_admin COPY --from=build-stage /code/django_airavata/apps/admin/static/django_airavata_admin . WORKDIR /code/django_airavata/apps/groups/static/django_airavata_groups COPY --from=build-stage /code/django_airavata/apps/groups/static/django_airavata_groups . +WORKDIR /code/django_airavata/apps/auth/static/django_airavata_auth +COPY --from=build-stage /code/django_airavata/apps/auth/static/django_airavata_auth . WORKDIR /code/django_airavata/apps/workspace/static/django_airavata_workspace COPY --from=build-stage /code/django_airavata/apps/workspace/static/django_airavata_workspace . WORKDIR /code/django_airavata/apps/dataparsers/static/django_airavata_dataparsers diff --git a/build_js.sh b/build_js.sh index 403616d..1ede0d5 100755 --- a/build_js.sh +++ b/build_js.sh @@ -6,6 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo -e "Running production JS builds" (cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run build) || exit 1 (cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run build) || exit 1 +(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run build) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run build) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run build) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run build) || exit 1 diff --git a/django_airavata/apps/admin/yarn.lock b/django_airavata/apps/admin/yarn.lock index 41fdae2..5d6ba57 100644 --- a/django_airavata/apps/admin/yarn.lock +++ b/django_airavata/apps/admin/yarn.lock @@ -8430,6 +8430,11 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vue-async-computed@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"; + integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA== + vue-datetime@^1.0.0-beta.10: version "1.0.0-beta.11" resolved "https://registry.yarnpkg.com/vue-datetime/-/vue-datetime-1.0.0-beta.11.tgz#283b5182dabe0ab372e375e9c47acb3b41524ffa"; diff --git a/django_airavata/apps/dataparsers/yarn.lock b/django_airavata/apps/dataparsers/yarn.lock index e870932..688895d 100644 --- a/django_airavata/apps/dataparsers/yarn.lock +++ b/django_airavata/apps/dataparsers/yarn.lock @@ -8378,6 +8378,11 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vue-async-computed@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"; + integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA== + vue-eslint-parser@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"; diff --git a/django_airavata/apps/groups/yarn.lock b/django_airavata/apps/groups/yarn.lock index 947e252..2f57e91 100644 --- a/django_airavata/apps/groups/yarn.lock +++ b/django_airavata/apps/groups/yarn.lock @@ -8378,6 +8378,11 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vue-async-computed@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"; + integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA== + vue-eslint-parser@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"; diff --git a/lint_js.sh b/lint_js.sh index 6be5575..ab82d5c 100755 --- a/lint_js.sh +++ b/lint_js.sh @@ -5,6 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo -e "Linting JS" (cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run lint) || exit 1 (cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run lint) || exit 1 +(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run lint) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run lint) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run lint) || exit 1 (cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run lint) || exit 1
