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

Consolidate the COPY commands

This commit is contained in:
Brett 2022-02-18 14:23:08 +01:00
parent 56219b7e01
commit 82ad95a0dd
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
images/ckan-base/2.7/Dockerfile
View File

@ -81,11 +81,9 @@ RUN addgroup -g 92 -S ckan && \
RUN mkdir -p $CKAN_STORAGE_PATH && \ RUN mkdir -p $CKAN_STORAGE_PATH && \
chown -R ckan:ckan $CKAN_STORAGE_PATH chown -R ckan:ckan $CKAN_STORAGE_PATH
COPY 2.7/setup/ckan-uwsgi.ini ${APP_DIR} # Copy setup files
COPY 2.7/setup/wsgi.py ${APP_DIR} COPY 2.7/setup ${APP_DIR}
COPY 2.7/setup/prerun.py ${APP_DIR} RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
COPY 2.7/setup/start_ckan.sh ${APP_DIR}
COPY 2.7/setup/supervisord.conf /etc/supervisord.conf
# Create entrypoint directory for children image scripts # Create entrypoint directory for children image scripts
ONBUILD RUN mkdir /docker-entrypoint.d ONBUILD RUN mkdir /docker-entrypoint.d

8
images/ckan-base/2.8/Dockerfile
View File

@ -79,11 +79,9 @@ RUN addgroup -g 92 -S ckan && \
RUN mkdir -p $CKAN_STORAGE_PATH && \ RUN mkdir -p $CKAN_STORAGE_PATH && \
chown -R ckan:ckan $CKAN_STORAGE_PATH chown -R ckan:ckan $CKAN_STORAGE_PATH
COPY 2.8/setup/ckan-uwsgi.ini ${APP_DIR} # Copy setup files
COPY 2.8/setup/wsgi.py ${APP_DIR} COPY 2.8/setup ${APP_DIR}
COPY 2.8/setup/prerun.py ${APP_DIR} RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
COPY 2.8/setup/start_ckan.sh ${APP_DIR}
COPY 2.8/setup/supervisord.conf /etc/supervisord.conf
# Create entrypoint directory for children image scripts # Create entrypoint directory for children image scripts
ONBUILD RUN mkdir /docker-entrypoint.d ONBUILD RUN mkdir /docker-entrypoint.d

9
images/ckan-base/2.9/Dockerfile
View File

@ -79,12 +79,9 @@ RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
RUN pip3 install supervisor && \ RUN pip3 install supervisor && \
mkdir /etc/supervisord.d mkdir /etc/supervisord.d
# Copy all setup files # Copy setup files
COPY 2.9/setup/ckan-uwsgi.ini ${APP_DIR} COPY 2.9/setup ${APP_DIR}
COPY 2.9/setup/wsgi.py ${APP_DIR} RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
COPY 2.9/setup/prerun.py ${APP_DIR}
COPY 2.9/setup/start_ckan.sh ${APP_DIR}
COPY 2.9/setup/supervisord.conf /etc/supervisord.conf
# Create a local user and group to run the app # Create a local user and group to run the app
RUN addgroup -g 92 -S ckan && \ RUN addgroup -g 92 -S ckan && \