Fix Dockerfiles
This commit is contained in:
parent
89610daec4
commit
8a599a11a4
|
@ -9,7 +9,7 @@ ENV TZ=UTC
|
||||||
WORKDIR ${APP_DIR}
|
WORKDIR ${APP_DIR}
|
||||||
|
|
||||||
# requirements.txt files fixed until next releases
|
# requirements.txt files fixed until next releases
|
||||||
COPY req_fixes ./req_fixes
|
COPY req_fixes req_fixes
|
||||||
|
|
||||||
# Extensions
|
# Extensions
|
||||||
### XLoader - 1.0.1 ###
|
### XLoader - 1.0.1 ###
|
||||||
|
@ -60,7 +60,7 @@ COPY docker-entrypoint.d/* /docker-entrypoint.d/
|
||||||
COPY setup/who.ini ./
|
COPY setup/who.ini ./
|
||||||
|
|
||||||
# Apply any patches needed to CKAN core
|
# Apply any patches needed to CKAN core
|
||||||
COPY patches ./
|
COPY patches 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 \
|
||||||
|
|
|
@ -57,12 +57,12 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
|
||||||
COPY setup/who.ini ./
|
COPY setup/who.ini ./
|
||||||
|
|
||||||
# Override start_ckan.sh with DEV sh
|
# Override start_ckan.sh with DEV sh
|
||||||
COPY setup/start_ckan_development.sh.override ./start_ckan_development.sh
|
COPY setup/start_ckan_development.sh.override start_ckan_development.sh
|
||||||
RUN chmod +x 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
|
# Apply any patches needed to CKAN core or any of the built extensions (not the
|
||||||
# runtime mounted ones!)
|
# runtime mounted ones!)
|
||||||
COPY patches ./
|
COPY patches 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 \
|
||||||
|
|
|
@ -21,7 +21,7 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
|
||||||
COPY setup/who.ini ./
|
COPY setup/who.ini ./
|
||||||
|
|
||||||
# Apply any patches needed to CKAN core
|
# Apply any patches needed to CKAN core
|
||||||
COPY patches ./
|
COPY patches patches
|
||||||
|
|
||||||
# Updated version of the Dockerfile RUN command that skips applying a patch if a reversed or previously applied patch is detected
|
# Updated version of the Dockerfile RUN command that skips applying a patch if a reversed or previously applied patch is detected
|
||||||
RUN for d in $APP_DIR/patches/*; do \
|
RUN for d in $APP_DIR/patches/*; do \
|
||||||
|
|
Loading…
Reference in New Issue