More updates
This commit is contained in:
parent
0b84974ed5
commit
29fd51e466
@ -10,7 +10,7 @@ located at the root directory
|
|||||||
- should there be a datapusher image pre-built like ckan? maybe an xloader image?
|
- should there be a datapusher image pre-built like ckan? maybe an xloader image?
|
||||||
|
|
||||||
|
|
||||||
Difference between ckan-base and ckan-dev
|
### Difference between ckan-base and ckan-dev ###
|
||||||
|
|
||||||
ckan-base
|
ckan-base
|
||||||
docker-compose up -d --build
|
docker-compose up -d --build
|
||||||
|
|||||||
@ -2,7 +2,9 @@ FROM ckan/ckan-base:testing-only.2.9
|
|||||||
|
|
||||||
LABEL maintainer="brett@kowh.ai"
|
LABEL maintainer="brett@kowh.ai"
|
||||||
|
|
||||||
# Set timezone
|
|
||||||
|
# Set up environment variables
|
||||||
|
ENV APP_DIR=/srv/app
|
||||||
ENV TZ=UTC
|
ENV TZ=UTC
|
||||||
RUN echo ${TZ} > /etc/timezone
|
RUN echo ${TZ} > /etc/timezone
|
||||||
|
|
||||||
@ -26,7 +28,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
|
|||||||
# See https://github.com/okfn/docker-ckan#applying-patches
|
# See https://github.com/okfn/docker-ckan#applying-patches
|
||||||
COPY patches ${APP_DIR}/patches
|
COPY patches ${APP_DIR}/patches
|
||||||
|
|
||||||
RUN for d in $APP_DIR/patches/*; do \
|
RUN for d in ${APP_DIR}/patches/*; do \
|
||||||
if [ -d $d ]; then \
|
if [ -d $d ]; then \
|
||||||
for f in `ls $d/*.patch | sort -g`; do \
|
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" ; \
|
cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
|
||||||
|
|||||||
@ -2,7 +2,8 @@ FROM ckan/ckan-dev:testing-only.2.9
|
|||||||
|
|
||||||
LABEL maintainer="brett@kowh.ai"
|
LABEL maintainer="brett@kowh.ai"
|
||||||
|
|
||||||
# Set timezone
|
# Set up environment variables
|
||||||
|
ENV APP_DIR=/srv/app
|
||||||
ENV TZ=UTC
|
ENV TZ=UTC
|
||||||
RUN echo ${TZ} > /etc/timezone
|
RUN echo ${TZ} > /etc/timezone
|
||||||
|
|
||||||
@ -26,7 +27,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
|
|||||||
# See https://github.com/okfn/docker-ckan#applying-patches
|
# See https://github.com/okfn/docker-ckan#applying-patches
|
||||||
COPY patches ${APP_DIR}/patches
|
COPY patches ${APP_DIR}/patches
|
||||||
|
|
||||||
RUN for d in $APP_DIR/patches/*; do \
|
RUN for d in ${APP_DIR}/patches/*; do \
|
||||||
if [ -d $d ]; then \
|
if [ -d $d ]; then \
|
||||||
for f in `ls $d/*.patch | sort -g`; do \
|
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" ; \
|
cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user