Skip to content

Commit

Permalink
Merge pull request #3847 from nasa-gibs/wv-2212-2
Browse files Browse the repository at this point in the history
fix container buildAll
  • Loading branch information
Benjaki2 authored Mar 22, 2022
2 parents ece4cec + 70bc640 commit 7b8f71c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ RUN cd /usr/src && \
pip --version
RUN mkdir -p /usr/local/stow
RUN cd /usr/local/stow && \
curl -O https://nodejs.org/download/release/v16.14.0/node-v16.14.0-linux-x64.tar.xz && \
tar xf node-v16.14.0-linux-x64.tar.xz && \
rm -f /usr/local/stow/node/node-v16.14.0-linux-x64.tar.xz && \
rm -f /usr/local/stow/node-v16.14.0-linux-x64/{LICENSE,*.md} && \
stow -S node-v16.14.0-linux-x64
curl -O https://nodejs.org/download/release/v16.14.0/node-v16.14.2-linux-x64.tar.xz && \
tar xf node-v16.14.2-linux-x64.tar.xz && \
rm -f /usr/local/stow/node/node-v16.14.2-linux-x64.tar.xz && \
rm -f /usr/local/stow/node-v16.14.2-linux-x64/{LICENSE,*.md} && \
stow -S node-v16.14.2-linux-x64

WORKDIR /build
# Only what is needed to run the development server and run the Selenium tests
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"license": "NASA-1.3",
"repository": "nasa-gibs/worldview",
"engines": {
"node": "16.14.0"
"node": "16.14.2"
},
"husky": {
"hooks": {
Expand All @@ -41,6 +41,7 @@
"build:prod": "cross-env NODE_ENV=production webpack",
"clean": "node ./tasks/clean.js",
"dist": "pipenv run run-s clean getcapabilities build:config build:prod && node ./tasks/dist.js",
"dist:bamboo": "run-s clean getcapabilities build:config build:prod && node ./tasks/dist.js",
"dist:dev": "pipenv run run-s clean getcapabilities build:config build:dev && node ./tasks/dist.js",
"distclean": "npm run clean && node ./tasks/distclean.js",
"docker:ci": "npm run docker:restart && docker exec -it worldview /bin/bash /build/e2e/docker-ci.sh ; npm run docker:stop",
Expand Down
11 changes: 8 additions & 3 deletions tasks/buildAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ npm config set user 0
npm config set unsafe-perm true
export npm_config_unsafe_perm=true

npm install --production=false

npm run dist
npm install --production=false --ignore-scripts
# npm run python
./tasks/pythonInstall.sh linux
# npm run dist:container
pipenv run npm run dist:bamboo
node ./tasks/dist.js
# build RPM
node rpm/buildRPM.js

# This is where bamboo expects to find artifacts
mv ~/rpmbuild build/rpm


0 comments on commit 7b8f71c

Please sign in to comment.