Skip to content

Commit 8eabba1

Browse files
committed
AIRAVATA-3455 Updating build scripts with auth frontend build
1 parent fef84db commit 8eabba1

File tree

7 files changed

+27
-0
lines changed

7 files changed

+27
-0
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ venv
55
**/dist
66
*.sqlite3
77
**/settings_local*.py
8+
.tox

Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ RUN yarn
3030
COPY ./django_airavata/apps/groups/ .
3131
RUN yarn run build
3232

33+
# build auth javascript
34+
WORKDIR /code/django_airavata/apps/auth
35+
COPY ./django_airavata/apps/auth/package.json ./django_airavata/apps/auth/yarn.lock ./
36+
RUN yarn
37+
COPY ./django_airavata/apps/auth/ .
38+
RUN yarn run build
39+
3340
# build workspace/django-airavata-workspace-plugin-api javascript
3441
# This one must come before workspace build
3542
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
8390
COPY --from=build-stage /code/django_airavata/apps/admin/static/django_airavata_admin .
8491
WORKDIR /code/django_airavata/apps/groups/static/django_airavata_groups
8592
COPY --from=build-stage /code/django_airavata/apps/groups/static/django_airavata_groups .
93+
WORKDIR /code/django_airavata/apps/auth/static/django_airavata_auth
94+
COPY --from=build-stage /code/django_airavata/apps/auth/static/django_airavata_auth .
8695
WORKDIR /code/django_airavata/apps/workspace/static/django_airavata_workspace
8796
COPY --from=build-stage /code/django_airavata/apps/workspace/static/django_airavata_workspace .
8897
WORKDIR /code/django_airavata/apps/dataparsers/static/django_airavata_dataparsers

build_js.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
echo -e "Running production JS builds"
77
(cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run build) || exit 1
88
(cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run build) || exit 1
9+
(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run build) || exit 1
910
(cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run build) || exit 1
1011
(cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run build) || exit 1
1112
(cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run build) || exit 1

django_airavata/apps/admin/yarn.lock

+5
Original file line numberDiff line numberDiff line change
@@ -8430,6 +8430,11 @@ vm-browserify@^1.0.1:
84308430
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
84318431
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
84328432

8433+
vue-async-computed@^3.9.0:
8434+
version "3.9.0"
8435+
resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"
8436+
integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA==
8437+
84338438
vue-datetime@^1.0.0-beta.10:
84348439
version "1.0.0-beta.11"
84358440
resolved "https://registry.yarnpkg.com/vue-datetime/-/vue-datetime-1.0.0-beta.11.tgz#283b5182dabe0ab372e375e9c47acb3b41524ffa"

django_airavata/apps/dataparsers/yarn.lock

+5
Original file line numberDiff line numberDiff line change
@@ -8378,6 +8378,11 @@ vm-browserify@^1.0.1:
83788378
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
83798379
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
83808380

8381+
vue-async-computed@^3.9.0:
8382+
version "3.9.0"
8383+
resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"
8384+
integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA==
8385+
83818386
vue-eslint-parser@^2.0.3:
83828387
version "2.0.3"
83838388
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"

django_airavata/apps/groups/yarn.lock

+5
Original file line numberDiff line numberDiff line change
@@ -8378,6 +8378,11 @@ vm-browserify@^1.0.1:
83788378
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
83798379
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
83808380

8381+
vue-async-computed@^3.9.0:
8382+
version "3.9.0"
8383+
resolved "https://registry.yarnpkg.com/vue-async-computed/-/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"
8384+
integrity sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA==
8385+
83818386
vue-eslint-parser@^2.0.3:
83828387
version "2.0.3"
83838388
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"

lint_js.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
55
echo -e "Linting JS"
66
(cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run lint) || exit 1
77
(cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run lint) || exit 1
8+
(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run lint) || exit 1
89
(cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run lint) || exit 1
910
(cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run lint) || exit 1
1011
(cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run lint) || exit 1

0 commit comments

Comments
 (0)