Skip to content

Commit

Permalink
Add step to copy init files
Browse files Browse the repository at this point in the history
Always copy the files in /docker-entrypoint.d automatically, otherwise
users need to explicitly add a `COPY` step in the `ckan/Dockerfile`,
which is confusing
  • Loading branch information
amercader committed Oct 17, 2023
1 parent 8cf41a2 commit f9ebc0c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ckan/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ ENV APP_DIR=/srv/app
ENV TZ=UTC
RUN echo ${TZ} > /etc/timezone


# Copy custom initialization scripts
COPY docker-entrypoint.d/* /docker-entrypoint.d/

# Make sure both files are not exactly the same
RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
Expand Down
4 changes: 3 additions & 1 deletion ckan/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
# Clone the extension(s) your are writing for your own project in the `src` folder
# to get them mounted in this image at runtime

# Copy custom initialization scripts
COPY docker-entrypoint.d/* /docker-entrypoint.d/

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

COPY patches ${APP_DIR}/patches

RUN for d in $APP_DIR/patches/*; do \
Expand Down
4 changes: 4 additions & 0 deletions ckan/docker-entrypoint.d/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Use scripts in this folder to run extra initialization steps in your custom CKAN images.
Any file with `.sh` or `.py` extension will be executed just after the main initialization
script (`prerun.py`) is executed and just before the web server and supervisor processes are
started.

0 comments on commit f9ebc0c

Please sign in to comment.