Skip to content

Commit

Permalink
Fix dev image
Browse files Browse the repository at this point in the history
  • Loading branch information
mjanez committed Aug 9, 2023
1 parent b2b2761 commit 754711c
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions ckan/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
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

0 comments on commit 754711c

Please sign in to comment.