From 620887f08b0b9870e0f0de866afe393fcec8df20 Mon Sep 17 00:00:00 2001
From: zhongjin <zhongjin@onenetcom.cn>
Date: Thu, 11 May 2023 13:13:26 +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 | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 30d9ccf..97691fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,10 +34,45 @@ RUN cd cartodb && bundle exec grunt
 #    /bin/bash -l -c 'bundle exec grunt'
     # && \
     #rm -rf .git /root/.cache/pip node_modules
-RUN cd cartodb/config && \
-  cp app_config.yml.sample app_config.yml && \
-  cp database.yml.sample database.yml && \
-  cp grunt_production.json.sample grunt_production.json    
 
+# Copy confs
+ADD ./config/CartoDB-dev.js \
+      /CartoDB-SQL-API/config/environments/development.js
+ADD ./config/WS-dev.js \
+      /Windshaft-cartodb/config/environments/development.js
+ADD ./config/app_config.yml /cartodb/config/app_config.yml
+ADD ./config/database.yml /cartodb/config/database.yml
+ADD ./create_dev_user /cartodb/script/create_dev_user
+ADD ./setup_organization.sh /cartodb/script/setup_organization.sh
+ADD ./config/cartodb.nginx.proxy.conf /etc/nginx/nginx.conf
+ADD ./config/varnish.vcl /etc/varnish.vcl
+ADD ./geocoder.sh /cartodb/script/geocoder.sh
+ADD ./geocoder_server.sql /cartodb/script/geocoder_server.sql
+ADD ./fill_geocoder.sh /cartodb/script/fill_geocoder.sh
+ADD ./sync_tables_trigger.sh /cartodb/script/sync_tables_trigger.sh
+ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+RUN mkdir -p /cartodb/log && touch /cartodb/log/users_modifications && \
+    /opt/varnish/sbin/varnishd -a :6081 -T localhost:6082 -s malloc,256m -f /etc/varnish.vcl && \
+    perl -pi.bak -e 's/^bind 127.0.0.1 ::1$/bind 0.0.0.0/' /etc/redis/redis.conf && \
+    service postgresql start && service redis-server start && \
+    perl -pi -e 's/0\.22\.0/0.22.2/' /cartodb/app/models/user/db_service.rb && \
+	bash -l -c "cd /cartodb && bash script/create_dev_user && \
+    bash script/setup_organization.sh && bash script/geocoder.sh" && \
+	service postgresql stop && service redis-server stop && \
+    chmod +x /cartodb/script/fill_geocoder.sh && \
+    chmod +x /cartodb/script/sync_tables_trigger.sh
+
+EXPOSE 80
+
+ENV GDAL_DATA /usr/share/gdal/2.2
+
+# Number of seconds between a sync tables task is run
+# Default interval is an hour, use `docker run -e SYNC_TABLES_INTERVAL=60 ...` to change it
+ENV SYNC_TABLES_INTERVAL 3600
+
+ADD ./startup.sh /opt/startup.sh
+
+CMD ["/bin/bash", "/opt/startup.sh"]
+HEALTHCHECK CMD curl -f http://localhost || exit 1