+
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ COPY . /girder/

# Build girder wheel file, and install it
RUN python3 setup.py bdist_wheel \
&& cd dist && python3 -m pip install --no-cache-dir girder && cd .. \
&& cd dist && python3 -m pip install --no-cache-dir `ls *.whl` && cd .. \
&& rm -rf build dist

RUN girder build && \
Expand Down
8 changes: 7 additions & 1 deletion girder/web_client/package.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"css-loader": "^0.26.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^0.11.2",
"get-intrinsic": "1.3.0",
"grunt": "^1.5.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-pug": "^1.0.0",
Expand All @@ -26,6 +27,7 @@
"lodash.mergewith": "^4.6.2",
"mkdirp": "^0.5.1",
"nib": "^1.1.2",
"npm-force-resolutions": "^0.0.10",
"pug": "^2.0.0-rc.3",
"pug-loader": "^2.3.0",
"style-loader": "^0.13.2",
Expand All @@ -43,9 +45,13 @@
"babel-polyfill": "^6.26.0",
"event-source": "^0.1.1"
},
"resolutions": {
"get-intrinsic": "1.3.0"
},
"scripts": {
"build": "grunt",
"watch": "grunt --watch"
"watch": "grunt --watch",
"preinstall": "if [ ! -f package-lock.json ]; then npm install --package-lock-only --ignore-scripts; fi && npx npm-force-resolutions"
},
"girder": {
"plugins": []
Expand Down
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载