From 09d6962abba3128a21f68b7d63ae46389f1dde40 Mon Sep 17 00:00:00 2001
From: zhongjin <zhongjin@onenetcom.cn>
Date: Thu, 11 May 2023 22:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b09e641..405036e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -189,12 +189,15 @@ RUN git clone https://git.kongjian.xin:8443/cartodb/cartodb-4.29.git cartodb &&
     service postgresql start && /bin/su postgres -c \
       /tmp/cartodb_pgsql.sh && service postgresql stop 
       
+RUN cd /cartodb && npm install 
+#    rm -r /tmp/npm-* /root/.npm && \
+
+RUN cd /cartodb &&  perl -pi -e 's/gdal==1\.10\.0/gdal==2.2.2/' python_requirements.txt && \
+    pip install --no-binary :all: -r python_requirements.txt 
+
 RUN cd /cartodb && \
-    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 && \
+    gem install bundler --version=1.17.3 && \
+    gem install compass archive-tar-minitar rack && \
     bundle update thin && \
     /bin/bash -l -c 'bundle install' && \
     cp config/grunt_development.json ./config/grunt_true.json && \