From 1bea0e7e6cdaaf57f65944731bf2e73d13946ebe Mon Sep 17 00:00:00 2001 From: Kiril-Poposki1998 Date: Wed, 13 Dec 2023 11:45:46 +0100 Subject: [PATCH] ckan 2.10 dockerfile update and scripts along with docker compose setup --- compose/2.10/.ckan-env | 6 +++--- compose/2.10/.env | 6 +++--- compose/2.10/docker-compose.yml | 2 +- compose/2.10/solr8/ckan_init_solr.sh | 2 +- images/ckan/2.10/Dockerfile | 8 ++++---- images/ckan/2.10/Dockerfile.focal | 7 +++---- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/compose/2.10/.ckan-env b/compose/2.10/.ckan-env index 5ad12d2..b9f2598 100644 --- a/compose/2.10/.ckan-env +++ b/compose/2.10/.ckan-env @@ -7,8 +7,8 @@ MAINTENANCE_MODE=false # General Settings CKAN_SITE_ID=default -CKAN_SITE_URL=http://localhost:5005 -CKAN_PORT=5005 +CKAN_SITE_URL=http://localhost:5000 +CKAN_PORT=5000 CKAN_MAX_UPLOAD_SIZE_MB=20 CKAN___BEAKER__SESSION__SECRET=CHANGE_ME # See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings @@ -38,5 +38,5 @@ CKAN__DATAPUSHER__API_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJ6M0l # CKAN__DATAPUSHER__API_TOKEN=replace_this_with_api_token_once_ckan_starts # Solr configuration -CKAN_VERSION=2.9.7 +CKAN_VERSION=2.10 CKAN_CORE_NAME=ckan \ No newline at end of file diff --git a/compose/2.10/.env b/compose/2.10/.env index 3a722e6..b9e1c2d 100644 --- a/compose/2.10/.env +++ b/compose/2.10/.env @@ -12,10 +12,10 @@ POSTGRES_PORT=5432 DATASTORE_READONLY_PASSWORD=datastore # CKAN -CKAN_VERSION=2.9.7 +CKAN_VERSION=2.10 CKAN_SITE_ID=default -CKAN_SITE_URL=http://localhost:5005 -CKAN_PORT=5005 +CKAN_SITE_URL=http://localhost:5000 +CKAN_PORT=5000 CKAN_MAX_UPLOAD_SIZE_MB=10 # Datapusher diff --git a/compose/2.10/docker-compose.yml b/compose/2.10/docker-compose.yml index bcd3f60..ccf8daf 100644 --- a/compose/2.10/docker-compose.yml +++ b/compose/2.10/docker-compose.yml @@ -1,5 +1,5 @@ # docker-compose build && docker-compose up -d -version: "3" +version: "3.8" volumes: ckan_data: diff --git a/compose/2.10/solr8/ckan_init_solr.sh b/compose/2.10/solr8/ckan_init_solr.sh index 8ea06c3..296d52b 100755 --- a/compose/2.10/solr8/ckan_init_solr.sh +++ b/compose/2.10/solr8/ckan_init_solr.sh @@ -8,7 +8,7 @@ set -e -CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/ckan-$CKAN_VERSION/ckan/config/solr/schema.solr8.xml +CKAN_SOLR_SCHEMA_URL=https://raw.githubusercontent.com/ckan/ckan/$CKAN_VERSION/ckan/config/solr/schema.xml echo "Check whether managed schema exists for CKAN $CKAN_VERSION" if ! curl --output /dev/null --silent --head --fail "$CKAN_SOLR_SCHEMA_URL"; then diff --git a/images/ckan/2.10/Dockerfile b/images/ckan/2.10/Dockerfile index becda88..b5e00cc 100644 --- a/images/ckan/2.10/Dockerfile +++ b/images/ckan/2.10/Dockerfile @@ -4,11 +4,11 @@ FROM alpine:3.17.2 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.10.0 +ENV IMAGE_TAG=2.10.2 # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.0 +ENV GIT_BRANCH=ckan-2.10.2 # Set src dirs ENV SRC_DIR=/srv/app/src @@ -57,7 +57,7 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh # RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3 +RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2 ########################### @@ -136,7 +136,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==21.12.0 +RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==22.10.2 # Create a local user and group to run the app RUN addgroup -g 92 -S ckan && \ diff --git a/images/ckan/2.10/Dockerfile.focal b/images/ckan/2.10/Dockerfile.focal index 369d7fd..7c2e867 100644 --- a/images/ckan/2.10/Dockerfile.focal +++ b/images/ckan/2.10/Dockerfile.focal @@ -8,7 +8,7 @@ ENV IMAGE_TAG=2.9.7-focal # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.9.7 +ENV GIT_BRANCH=ckan-2.10.2 # Set timezone ENV TZ=UTC @@ -81,8 +81,7 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh RUN ${SRC_DIR}/apply_ckan_patches.sh RUN rm -rf /srv/app/src/ckan/.git RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt -RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3 - +RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2 ########################### ### Default-Extensions #### @@ -192,7 +191,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels COPY --from=ckanbuild /srv/app/src/ckan ${CKAN_DIR} # Additional install steps for build stages artifacts -RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==21.12.0 +RUN pip install --no-index --find-links=/srv/app/wheels uWSGI==2.0.20 gevent==22.10.2 # Create a local user and group to run the app RUN groupadd -g 92 ckan && \