New CKAN patches 2.7.10, 2.8.7 and 2.9.2
This commit is contained in:
parent
c1e3181446
commit
69ec6e65b6
|
@ -48,7 +48,7 @@ We recommend to use a multi-stage approach to extend the docker images that we p
|
|||
###################
|
||||
### Extensions ####
|
||||
###################
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.1 as extbuild
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.2 as extbuild
|
||||
|
||||
# Switch to the root user
|
||||
USER root
|
||||
|
@ -62,7 +62,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0
|
|||
############
|
||||
### MAIN ###
|
||||
############
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.1
|
||||
FROM ghcr.io/keitaroinc/ckan:2.9.2
|
||||
|
||||
# Add the custom extensions to the plugins list
|
||||
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme
|
||||
|
@ -92,9 +92,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit
|
|||
## Build
|
||||
To build a CKAN image run:
|
||||
```sh
|
||||
docker build --tag ghcr.io/keitaroinc/ckan:2.9.1 images/ckan/2.9
|
||||
docker build --tag ghcr.io/keitaroinc/ckan:2.9.2 images/ckan/2.9
|
||||
```
|
||||
The –-tag ghcr.io/keitaroinc/ckan:2.9.1 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.1 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
|
||||
The –-tag ghcr.io/keitaroinc/ckan:2.9.2 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.2 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
|
||||
|
||||
## Upload to DockerHub
|
||||
>*It's recommended to upload built images to DockerHub*
|
||||
|
|
|
@ -12,7 +12,7 @@ POSTGRES_PORT=5432
|
|||
DATASTORE_READONLY_PASSWORD=datastore
|
||||
|
||||
# CKAN
|
||||
CKAN_VERSION=2.9.1
|
||||
CKAN_VERSION=2.9.2
|
||||
CKAN_SITE_ID=default
|
||||
CKAN_SITE_URL=http://localhost:5000
|
||||
CKAN_PORT=5000
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
solrconfig-2.8.7.xml
|
|
@ -1 +0,0 @@
|
|||
solrconfig-2.8.6.xml
|
|
@ -12,7 +12,7 @@ POSTGRES_PORT=5432
|
|||
DATASTORE_READONLY_PASSWORD=datastore
|
||||
|
||||
# CKAN
|
||||
CKAN_VERSION=2.8.6
|
||||
CKAN_VERSION=2.8.7
|
||||
CKAN_SITE_ID=default
|
||||
CKAN_SITE_URL=http://localhost:5000
|
||||
CKAN_PORT=5000
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
###################
|
||||
### Extensions ####
|
||||
###################
|
||||
FROM ghcr.io/keitaroinc/ckan:2.8.6 as extbuild
|
||||
FROM ghcr.io/keitaroinc/ckan:2.8.7 as extbuild
|
||||
|
||||
# Locations and tags, please use specific tags or revisions
|
||||
ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore
|
||||
|
@ -20,7 +20,7 @@ USER ckan
|
|||
############
|
||||
### MAIN ###
|
||||
############
|
||||
FROM ghcr.io/keitaroinc/ckan:2.8.6
|
||||
FROM ghcr.io/keitaroinc/ckan:2.8.7
|
||||
|
||||
LABEL maintainer="Keitaro Inc <info@keitaro.com>"
|
||||
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM alpine:3.13 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.7.9
|
||||
ENV IMAGE_TAG=2.7.10
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.7.9
|
||||
ENV GIT_BRANCH=ckan-2.7.10
|
||||
|
||||
# Set src dirs
|
||||
ENV SRC_DIR=/srv/app/src
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM ubuntu:focal-20201106 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.7.9-focal
|
||||
ENV IMAGE_TAG=2.7.10-focal
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.7.9
|
||||
ENV GIT_BRANCH=ckan-2.7.10
|
||||
|
||||
# Set timezone
|
||||
ENV TZ=UTC
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM alpine:3.13 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.8.6
|
||||
ENV IMAGE_TAG=2.8.7
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.8.6
|
||||
ENV GIT_BRANCH=ckan-2.8.7
|
||||
|
||||
# Set src dirs
|
||||
ENV SRC_DIR=/srv/app/src
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM ubuntu:focal-20201106 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.8.6-focal
|
||||
ENV IMAGE_TAG=2.8.7-focal
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.8.6
|
||||
ENV GIT_BRANCH=ckan-2.8.7
|
||||
|
||||
# Set timezone
|
||||
ENV TZ=UTC
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM alpine:3.13 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.9.1
|
||||
ENV IMAGE_TAG=2.9.2
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.9.1
|
||||
ENV GIT_BRANCH=ckan-2.9.2
|
||||
|
||||
# Set src dirs
|
||||
ENV SRC_DIR=/srv/app/src
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
FROM ubuntu:focal-20201106 as ckanbuild
|
||||
|
||||
# Used by Github Actions to tag the image with
|
||||
ENV IMAGE_TAG=2.9.1-focal
|
||||
ENV IMAGE_TAG=2.9.2-focal
|
||||
|
||||
# Set CKAN version to build
|
||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||
ENV GIT_BRANCH=ckan-2.9.1
|
||||
ENV GIT_BRANCH=ckan-2.9.2
|
||||
|
||||
# Set timezone
|
||||
ENV TZ=UTC
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
--- ckan/ckan/logic/action/get.py 2020-12-09 12:05:49.800909223 +0100
|
||||
+++ get_limit_type_check.py 2020-12-09 12:11:58.404000000 +0100
|
||||
@@ -371,8 +371,8 @@
|
||||
'ckan.group_and_organization_list_all_fields_max', 25)
|
||||
else:
|
||||
max_limit = config.get('ckan.group_and_organization_list_max', 1000)
|
||||
- if limit is None or limit > max_limit:
|
||||
- limit = max_limit
|
||||
+ if limit is None or int(limit) > max_limit:
|
||||
+ limit = str(max_limit)
|
||||
|
||||
# order_by deprecated in ckan 1.8
|
||||
# if it is supplied and sort isn't use order_by and raise a warning
|
Loading…
Reference in New Issue