Update to 2.5.3

This commit is contained in:
Marko Bocevski 2016-11-07 12:10:47 +01:00
parent d2301f7633
commit 87226ae754
1 changed files with 3 additions and 5 deletions

View File

@ -4,8 +4,8 @@ MAINTAINER Keitaro Inc <info@keitaro.info>
ENV APP_DIR=/srv/app ENV APP_DIR=/srv/app
ENV SRC_DIR=/srv/app/src ENV SRC_DIR=/srv/app/src
ENV GIT_URL=https://github.com/keitaroinc/ckan.git ENV GIT_URL=https://github.com/ckan/ckan.git
ENV GIT_BRANCH=ckan-2.5-map-fix3 ENV GIT_BRANCH=ckan-2.5.3
ENV CKAN_SITE_URL=http://localhost:5000 ENV CKAN_SITE_URL=http://localhost:5000
ENV CKAN__PLUGINS image_view text_view recline_view datastore datapusher envvars ENV CKAN__PLUGINS image_view text_view recline_view datastore datapusher envvars
@ -33,7 +33,7 @@ RUN apk add --no-cache git \
git clone -b 3.6.0 --depth=1 --single-branch https://git.osgeo.org/gogs/geos/geos.git ${SRC_DIR}/geos && \ git clone -b 3.6.0 --depth=1 --single-branch https://git.osgeo.org/gogs/geos/geos.git ${SRC_DIR}/geos && \
cd ${SRC_DIR}/geos && \ cd ${SRC_DIR}/geos && \
./autogen.sh && \ ./autogen.sh && \
./configure && \ ./configure --prefix /usr && \
make -j2 && \ make -j2 && \
make install && \ make install && \
# Fetch CKAN and install # Fetch CKAN and install
@ -43,8 +43,6 @@ RUN apk add --no-cache git \
python setup.py install && \ python setup.py install && \
pip install --no-cache-dir testrepository && \ pip install --no-cache-dir testrepository && \
pip install --no-cache-dir --upgrade -r requirements.txt && \ pip install --no-cache-dir --upgrade -r requirements.txt && \
# Fix issue with html5lib in 2.5.2
pip install --no-cache-dir html5lib==0.9999999 && \
# Remove temporary packages and files # Remove temporary packages and files
apk del .build-deps && \ apk del .build-deps && \
rm -rf ${SRC_DIR} rm -rf ${SRC_DIR}