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

Merge pull request #29 from ckan/new-changes-(Feb-18-2022) 

New changes (feb 18 2022)
This commit is contained in:
Brett Jones 2022-06-01 09:57:38 +02:00 committed by GitHub
parent 56219b7e01 28f6901238
commit 5d9808e76d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
README.txt
View File

@ -31,3 +31,36 @@ Use a bind mount for the config file (ckan.ini)
-d ckan-docker_ckan
Maybe include a script to replace docker-compose if required
Dev Mode (OKFN)
The differences between Docker dev abd Docker base is as the following:
docker-compose.dev.yml
solr: explicitly puts in ports (8983:8983)
db: Doesn't pass in environment and arg values
ckan: has extra volume bind mount (./src:/srv/app/src_extensions)
Dockerfile.dev
Takes the base image and
Adds a new directory (SRC_EXTENSIONS_DIR=/srv/app/src_extensions)
installs libffi-dev
installs dev-requirements.txt
runs different start script (start_ckan_development.sh) which installs any extension located in SRC_EXTENSIONS_DIR
runs a typical Dev install
pip install -r pip-requirements.txt
pip install -r requirements.txt
pip install -r dev-requirements.txt
python3 setup.py develop
ckan config-tool test.ini
ckan config-tool $CKAN_INI -s DEFAULT "debug = true"
ckan config-tool $CKAN_INI "ckan.plugins = $CKAN__PLUGINS"
ckan config-tool $SRC_DIR/ckan/test-core.ini \
"sqlalchemy.url = $TEST_CKAN_SQLALCHEMY_URL" \
"ckan.datastore.write_url = $TEST_CKAN_DATASTORE_WRITE_URL" \
"ckan.datastore.read_url = $TEST_CKAN_DATASTORE_READ_URL" \
"solr_url = $TEST_CKAN_SOLR_URL" \
"ckan.redis.url = $TEST_CKAN_REDIS_URL"
All other steps are similar to the base Dockerfile

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 && \
chown -R ckan:ckan $CKAN_STORAGE_PATH
COPY 2.7/setup/ckan-uwsgi.ini ${APP_DIR}
COPY 2.7/setup/wsgi.py ${APP_DIR}
COPY 2.7/setup/prerun.py ${APP_DIR}
COPY 2.7/setup/start_ckan.sh ${APP_DIR}
COPY 2.7/setup/supervisord.conf /etc/supervisord.conf
# Copy setup files
COPY 2.7/setup ${APP_DIR}
RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
# Create entrypoint directory for children image scripts
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 && \
chown -R ckan:ckan $CKAN_STORAGE_PATH
COPY 2.8/setup/ckan-uwsgi.ini ${APP_DIR}
COPY 2.8/setup/wsgi.py ${APP_DIR}
COPY 2.8/setup/prerun.py ${APP_DIR}
COPY 2.8/setup/start_ckan.sh ${APP_DIR}
COPY 2.8/setup/supervisord.conf /etc/supervisord.conf
# Copy setup files
COPY 2.8/setup ${APP_DIR}
RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
# Create entrypoint directory for children image scripts
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 && \
mkdir /etc/supervisord.d
# Copy all setup files
COPY 2.9/setup/ckan-uwsgi.ini ${APP_DIR}
COPY 2.9/setup/wsgi.py ${APP_DIR}
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
# Copy setup files
COPY 2.9/setup ${APP_DIR}
RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
# Create a local user and group to run the app
RUN addgroup -g 92 -S ckan && \