Merge branch 'master' of https://git.spacen.net/cartodb4/t
This commit is contained in:
commit
16033f70e1
25
README.md
25
README.md
@ -1,3 +1,28 @@
|
|||||||
|
# Docker 重建
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
rm -rf .git && \
|
||||||
|
rm -rf rm lib/sql && rm -rf app/assets/stylesheets/old_common && rm -rf lib/assets/javascripts/cdb && \
|
||||||
|
git init && \
|
||||||
|
git remote add origin https://git.spacen.net/cartodb4/t.git && \
|
||||||
|
git fetch --all && \
|
||||||
|
git reset --hard origin/master && \
|
||||||
|
git branch --set-upstream-to=origin/master master && \
|
||||||
|
|
||||||
|
git pull && \
|
||||||
|
git submodule update && \
|
||||||
|
|
||||||
|
git submodule foreach git pull && \
|
||||||
|
|
||||||
|
|
||||||
|
cd carto.js && npm install && npm link && cd .. && npm link internal-carto.js
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
# What is CARTO?
|
# What is CARTO?
|
||||||
|
|
||||||
[![Code Climate](https://codeclimate.com/github/CartoDB/cartodb20.png)](https://codeclimate.com/github/CartoDB/cartodb20)
|
[![Code Climate](https://codeclimate.com/github/CartoDB/cartodb20.png)](https://codeclimate.com/github/CartoDB/cartodb20)
|
||||||
|
@ -37,7 +37,6 @@
|
|||||||
"fastclick": "^1.0.6",
|
"fastclick": "^1.0.6",
|
||||||
"html-webpack-plugin": "^3.2.0",
|
"html-webpack-plugin": "^3.2.0",
|
||||||
"imports-loader": "^0.8.0",
|
"imports-loader": "^0.8.0",
|
||||||
"internal-carto.js": "git+https://git.spacen.net/cartodb4/carto.js-3.15.git",
|
|
||||||
"jquery": "2.1.4",
|
"jquery": "2.1.4",
|
||||||
"leaflet": "CartoDB/Leaflet#v1.3.1-carto1",
|
"leaflet": "CartoDB/Leaflet#v1.3.1-carto1",
|
||||||
"loader-utils": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
|
"loader-utils": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
|
||||||
|
Loading…
Reference in New Issue
Block a user