diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index afff19a..fb72365 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -6,6 +6,7 @@ ENV APP_DIR=/srv/app \ SRC_EXTENSIONS_DIR=/srv/app/src_extensions RUN echo ${TZ} > /etc/timezone && \ + set -ex && apk --no-cache add sudo && \ # Make sure both files are not exactly the same if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime ; fi @@ -57,12 +58,12 @@ RUN chmod +x ${APP_DIR}/start_ckan_development.sh # Apply any patches needed to CKAN core or any of the built extensions (not the # runtime mounted ones) -# COPY patches ${APP_DIR}/patches +COPY patches ${APP_DIR}/patches -# RUN for d in $APP_DIR/patches/*; do \ -# if [ -d $d ]; then \ -# for f in `ls $d/*.patch | sort -g`; do \ -# cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \ -# done ; \ -# fi ; \ -# done \ No newline at end of file +RUN for d in $APP_DIR/patches/*; do \ + if [ -d $d ]; then \ + for f in `ls $d/*.patch | sort -g`; do \ + cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \ + done ; \ + fi ; \ + done \ No newline at end of file