diff --git a/Dockerfile b/Dockerfile index ea975b6..b491f6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,31 +18,24 @@ ADD ./fonts/SourceHanSansCN-Regular.otf /usr/share/fonts/SourceHanSansCN-Regular RUN apt-get install -y nano net-tools ca-certificates -#RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ -# apt-get install -y nodejs && \ -# curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null && \ -# echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ -# apt-get update && apt-get install -y yarn +RUN rm -rf /cartodb -#RUN rm -rf /cartodb - -#RUN git clone https://git.kongjian.xin:8443/cartodb/cartodb-4.29.git cartodb && \ -# cd cartodb && \ - # Install cartodb extension +RUN git clone https://git.kongjian.xin:8443/cartodb/cartodb-4.29.git cartodb && \ + cd cartodb && \ # cd lib/sql && \ # PGUSER=postgres make install && \ # service postgresql start && /bin/su postgres -c \ # /tmp/cartodb_pgsql.sh && service postgresql stop && \ # cd - && \ -# npm install && \ + npm install && \ # rm -r /tmp/npm-* /root/.npm && \ # perl -pi -e 's/gdal==1\.10\.0/gdal==2.2.2/' python_requirements.txt && \ # pip install --no-binary :all: -r python_requirements.txt && \ # gem install bundler --version=1.17.3 && gem install compass archive-tar-minitar rack && \ # bundle update thin && \ -# /bin/bash -l -c 'bundle install' && \ + /bin/bash -l -c 'bundle install' && \ # cp config/grunt_development.json ./config/grunt_true.json && \ -# /bin/bash -l -c 'bundle exec grunt' + /bin/bash -l -c 'bundle exec grunt' # && \ #rm -rf .git /root/.cache/pip node_modules