diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 490ad8e..c87c3ad 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -60,10 +60,6 @@ COPY setup/who.ini ./ COPY setup/start_ckan_development.sh.override start_ckan_development.sh RUN chmod +x start_ckan_development.sh -# Apply any patches needed to CKAN core or any of the built extensions (not the -# runtime mounted ones) -COPY patches patches - # Apply any patches needed to CKAN core or any of the built extensions (not the # runtime mounted ones!) COPY patches patches @@ -71,12 +67,12 @@ COPY patches patches RUN for d in $APP_DIR/patches/*; do \ if [ -d $d ]; then \ for f in `ls $d/*.patch | sort -g`; do \ - if [ -d $SRC_EXTENSIONS_DIR/`basename "$d"` ]; then \ - cd $SRC_EXTENSIONS_DIR/`basename "$d"` && \ - echo "$0: Applying patch $f to $SRC_EXTENSIONS_DIR/`basename $d`" && \ + if [ -d $SRC_DIR/`basename "$d"` ]; then \ + cd $SRC_DIR/`basename "$d"` && \ + echo "$0: Applying patch $f to $SRC_DIR/`basename $d`" && \ patch -p1 < "$f" ; \ else \ - echo "$0: Skipping patch $f because directory $SRC_EXTENSIONS_DIR/`basename $d` does not exist. Built the extension: `basename $d`" ; \ + echo "$0: Skipping patch $f because directory $SRC_DIR/`basename $d` does not exist. Built the extension: `basename $d`" ; \ fi \ done ; \ fi ; \