Varnish download location has moved + Cartodb repo now longer accepts environment during grunt task, so dropped it

This commit is contained in:
Stefan Verhoeven 2017-09-08 19:03:45 +02:00
parent 5218b9940e
commit d919441db4

View File

@ -100,14 +100,14 @@ RUN git config --global user.name "Your Name"
# Varnish 3, Ubuntu:16.04 comes with Varnish 4.1 which can't be run with anonymous admin telnet # Varnish 3, Ubuntu:16.04 comes with Varnish 4.1 which can't be run with anonymous admin telnet
RUN cd /opt && \ RUN cd /opt && \
wget https://repo.varnish-cache.org/source/varnish-3.0.7.tar.gz && \ wget http://varnish-cache.org/_downloads/varnish-3.0.7.tgz && \
tar -zxf varnish-3.0.7.tar.gz && \ tar -zxf varnish-3.0.7.tgz && \
cd varnish-3.0.7 && \ cd varnish-3.0.7 && \
./configure --prefix=/opt/varnish && \ ./configure --prefix=/opt/varnish && \
make && \ make && \
make install && \ make install && \
cd /opt && \ cd /opt && \
rm -rf varnish-3.0.7 varnish-3.0.7.tar.gz rm -rf varnish-3.0.7 varnish-3.0.7.tgz
# ogr2ogr2 static build, see https://github.com/CartoDB/cartodb/wiki/How-to-build-gdal-and-ogr2ogr2 # ogr2ogr2 static build, see https://github.com/CartoDB/cartodb/wiki/How-to-build-gdal-and-ogr2ogr2
# using cartodb instruction got error https://trac.osgeo.org/gdal/ticket/6073 # using cartodb instruction got error https://trac.osgeo.org/gdal/ticket/6073
@ -194,7 +194,8 @@ RUN git clone --recursive git://github.com/CartoDB/cartodb.git && \
pip install --upgrade pip && \ pip install --upgrade pip && \
pip install --no-binary :all: -r python_requirements.txt && \ pip install --no-binary :all: -r python_requirements.txt && \
/bin/bash -l -c 'bundle install' && \ /bin/bash -l -c 'bundle install' && \
/bin/bash -l -c 'bundle exec grunt --environment development' && \ cp config/grunt_development.json ./config/grunt_true.json && \
/bin/bash -l -c 'bundle exec grunt' && \
rm -rf .git /root/.cache/pip node_modules rm -rf .git /root/.cache/pip node_modules
# Geocoder SQL client + server # Geocoder SQL client + server