Skip to content

Commit

Permalink
Merged in dev/gideon/add_node_modules_to_admin-tools_tgz_2021.02.21 (…
Browse files Browse the repository at this point in the history
…pull request elastic#51)

* admin-tools build: add node modules to tgz

Problem:
Running npm ci for all components for all sandboxes during first boot is
starting to take too long.

Solution:
Install and package node modules during build. Removee "npm ci" from
rc.local and update-engageli-sandboxes.sh

Approved-by: Rich Nessel
  • Loading branch information
Gideon Avida committed Jan 30, 2021
1 parent 0219c3d commit df27673
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
3 changes: 2 additions & 1 deletion bitbucket-pipelines.yml
Expand Up @@ -29,5 +29,6 @@ pipelines:
- apt-get update && apt-get install -y awscli
- git submodule update --init
- "cd $BITBUCKET_CLONE_DIR/admin-tools"
- "tar czvf admin-tools-$BITBUCKET_TAG.tgz admin.js backend-shared config generate_local_config.js package-lock.json package.json"
- "npm ci"
- "tar czvf admin-tools-$BITBUCKET_TAG.tgz admin.js backend-shared config generate_local_config.js node_modules package-lock.json package.json"
- "aws s3 cp admin-tools-$BITBUCKET_TAG.tgz s3://engageli-shared-assets/admin-tools/"
3 changes: 0 additions & 3 deletions instance-files/engageli/etc/rc.local
Expand Up @@ -95,7 +95,6 @@ do
mkdir -p $SANDBOX
cd $SANDBOX
tar xvzf $ARTIFACT_DIR/backend1-$VERSION.tgz
npm ci
./utils/generate_local_config.js -f config/local.yml -H $FQDN -n $SANDBOX \
-p $SANDBOX_PORT -s -a $AMS_LB_DNS --pg-iam-auth --pg-host $PGHOST \
--region $REGION --redis-host $REDIS_HOST --redis-secret $REDIS_SECRET \
Expand All @@ -107,15 +106,13 @@ do
mkdir -p "admin-$SANDBOX"
cd "admin-$SANDBOX"
tar xvzf $ARTIFACT_DIR/admin-tools-$VERSION.tgz
npm ci
./generate_local_config.js -f config/local.yml -n $SANDBOX -r $REGION

# media-manager backend
cd $MEDIA_MANAGER_BACKEND_BASE
mkdir -p $SANDBOX
cd $SANDBOX
tar xvzf $ARTIFACT_DIR/mm-backend-$VERSION.tgz
npm ci
BUCKET=engageli-$STACK_NAME-media-manager-$SANDBOX-$REGION
./utils/generate_local_config.js \
-f config/local.yml \
Expand Down
Expand Up @@ -62,7 +62,6 @@ aws s3 cp s3://engageli-shared-assets/media-manager-ui/mm-webapp-$VERSION.tgz $C
cd /usr/local/engageli-admin/admin-$SANDBOX
sudo chown -R $(whoami) .
tar xvzf $CACHE_DIR/admin-tools-$VERSION.tgz
npm ci

# backend1 api service
sudo service engageli-$SANDBOX stop
Expand All @@ -74,7 +73,6 @@ cd $SANDBOX
# Don't delete: need to keep config/local.yml
# rm -rf *
tar xvzf $CACHE_DIR/backend1-$VERSION.tgz
npm ci
./utils/post_rsync.sh -n $SANDBOX

# Student web-app
Expand All @@ -95,7 +93,6 @@ sudo chown -R $(whoami) $SANDBOX
sudo tar cvzf $SANDBOX-$NOW.tgs $SANDBOX
cd $SANDBOX
tar xvzf $CACHE_DIR/mm-backend-$VERSION.tgz
npm ci
./utils/post_rsync.sh -n $SANDBOX

# media-manager frontend web-app
Expand Down

0 comments on commit df27673

Please sign in to comment.