From c4ac6d0d48341541f88f650812d6746e538c820d Mon Sep 17 00:00:00 2001
From: zhongjin <zhongjin@onenetcom.cn>
Date: Thu, 11 May 2023 12:43:34 +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 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 10e6201..a685347 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,13 +22,8 @@ RUN rm -rf /cartodb
 
 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 
+RUN cd cartodb && bundle exec grunt
 #    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 && \
@@ -36,7 +31,7 @@ RUN git clone https://git.kongjian.xin:8443/cartodb/cartodb-4.29.git cartodb &&
 #    bundle update thin && \
 #    /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