Skip to content

Commit

Permalink
Fix Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
mjanez authored Oct 2, 2023
1 parent 89610da commit 8a599a1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions ckan/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV TZ=UTC
WORKDIR ${APP_DIR}

# requirements.txt files fixed until next releases
COPY req_fixes ./req_fixes
COPY req_fixes req_fixes

# Extensions
### XLoader - 1.0.1 ###
Expand Down Expand Up @@ -60,14 +60,14 @@ COPY docker-entrypoint.d/* /docker-entrypoint.d/
COPY setup/who.ini ./

# Apply any patches needed to CKAN core
COPY patches ./
COPY patches patches

RUN for d in $APP_DIR/patches/*; do \

Check warning on line 65 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/test-docker-pr:ckan-2.9.9

Use WORKDIR to switch to a directory

Check warning on line 65 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/test-docker-pr:ckan-2.9.9

Set the SHELL option -o pipefail before RUN with a pipe in it. If you are using /bin/sh in an alpine image or if your shell is symlinked to busybox then consider explicitly setting your SHELL to /bin/ash, or disable this check

Check failure on line 65 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/build-docker-push:ckan-2.9.9

DL3003 warning: Use WORKDIR to switch to a directory

Check failure on line 65 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/build-docker-push:ckan-2.9.9

DL4006 warning: Set the SHELL option -o pipefail before RUN with a pipe in it. If you are using /bin/sh in an alpine image or if your shell is symlinked to busybox then consider explicitly setting your SHELL to /bin/ash, or disable this check

Check failure on line 65 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/build-docker-push:ckan-2.9.9

SC2086 info: Double quote to prevent globbing and word splitting.
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 ; \
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

CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"]
4 changes: 2 additions & 2 deletions ckan/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
COPY setup/who.ini ./

# 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

# Apply any patches needed to CKAN core or any of the built extensions (not the
# runtime mounted ones!)
COPY patches ./
COPY patches patches

RUN for d in $APP_DIR/patches/*; do \
if [ -d $d ]; then \
Expand Down
2 changes: 1 addition & 1 deletion ckan/Dockerfile.ghcr
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ COPY docker-entrypoint.d/* docker-entrypoint.d/
COPY setup/who.ini ./

# 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
RUN for d in $APP_DIR/patches/*; do \

Check warning on line 27 in ckan/Dockerfile.ghcr

View workflow job for this annotation

GitHub Actions / runner/test-docker-pr:ckan-2.9.9

Use WORKDIR to switch to a directory

Check warning on line 27 in ckan/Dockerfile.ghcr

View workflow job for this annotation

GitHub Actions / runner/test-docker-pr:ckan-2.9.9

Set the SHELL option -o pipefail before RUN with a pipe in it. If you are using /bin/sh in an alpine image or if your shell is symlinked to busybox then consider explicitly setting your SHELL to /bin/ash, or disable this check
Expand Down

0 comments on commit 8a599a1

Please sign in to comment.