CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Dockerfiles

This commit is contained in:
mjanez 2023-10-02 07:41:25 +00:00 committed by GitHub
parent 89610daec4
commit 8a599a11a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ckan/Dockerfile
View File

@ -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,14 +60,14 @@ 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 \
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" ; \
done ; \ done ; \
fi ; \ fi ; \
done done
CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"] CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"]

4
ckan/Dockerfile.dev
View File

@ -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 \

2
ckan/Dockerfile.ghcr
View File

@ -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 \