Apply patches to the ckan Dockerfile
This commit is contained in:
parent
b7bc353eb5
commit
b843de1946
|
@ -67,12 +67,19 @@ COPY setup/who.ini ./
|
|||
COPY patches 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
|
||||
if [ -d $d ]; then \
|
||||
for f in `ls $d/*.patch | sort -g`; do \
|
||||
cd $SRC_DIR/`basename "$d"` && \
|
||||
if patch -R --dry-run -p1 < "$f"; then \
|
||||
echo "$0: Patch $f has already been applied or reversed, skipping..."; \
|
||||
else \
|
||||
echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; \
|
||||
sed -i 's/\r$//' "$f" && \
|
||||
patch -p1 < "$f" ; \
|
||||
fi \
|
||||
done ; \
|
||||
fi ; \
|
||||
done
|
||||
|
||||
# Workers
|
||||
## Update start_ckan.sh with custom workers
|
||||
|
|
|
@ -32,6 +32,7 @@ RUN for d in $APP_DIR/patches/*; do \
|
|||
echo "$0: Patch $f has already been applied or reversed, skipping..."; \
|
||||
else \
|
||||
echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; \
|
||||
sed -i 's/\r$//' "$f" && \
|
||||
patch -p1 < "$f" ; \
|
||||
fi \
|
||||
done ; \
|
||||
|
|
Loading…
Reference in New Issue